# define LASSERTF(cond, ...) ((void)sizeof!!(cond))
#endif /* !LIBCFS_DEBUG */
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
/**
* This is for more expensive checks that one doesn't want to be enabled all
* the time. LINVRNT() has to be explicitly enabled by --enable-invariants
assert(cond); \
} while (0)
# define LBUG() assert(0)
-# ifdef INVARIANT_CHECK
+# ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
# define LINVRNT(exp) LASSERT(exp)
# else
# define LINVRNT(exp) ((void)sizeof!!(exp))
[set maximum lnet payload in MBytes]),
[
AC_MSG_RESULT([$with_max_payload_mb])
- LNET_MAX_PAYLOAD_MB=$with_max_payload_mb
- LNET_MAX_PAYLOAD="(($with_max_payload_mb)<<20)"
+ CONFIG_LNET_MAX_PAYLOAD_MB=$with_max_payload_mb
+ CONFIG_LNET_MAX_PAYLOAD="(($with_max_payload_mb)<<20)"
], [
AC_MSG_RESULT([no])
- LNET_MAX_PAYLOAD="LNET_MTU"
+ CONFIG_LNET_MAX_PAYLOAD="LNET_MTU"
])
- AC_DEFINE_UNQUOTED(LNET_MAX_PAYLOAD, $LNET_MAX_PAYLOAD,
+ AC_DEFINE_UNQUOTED(CONFIG_LNET_MAX_PAYLOAD, $CONFIG_LNET_MAX_PAYLOAD,
[Max LNET payload])
])
#define LNET_MAX_IOV 256
/* Max payload size */
-#ifndef LNET_MAX_PAYLOAD
-# error "LNET_MAX_PAYLOAD must be defined in config.h"
+#ifndef CONFIG_LNET_MAX_PAYLOAD
+# error "CONFIG_LNET_MAX_PAYLOAD must be defined in config.h"
#else
+# define LNET_MAX_PAYLOAD CONFIG_LNET_MAX_PAYLOAD
# if (LNET_MAX_PAYLOAD < LNET_MTU)
# error "LNET_MAX_PAYLOAD too small - error in configure --with-max-payload-mb"
# elif defined(__KERNEL__)
OBD_BUFFER_SIZE=8192
])
AC_MSG_RESULT([$OBD_BUFFER_SIZE bytes])
-AC_DEFINE_UNQUOTED(OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size])
+AC_DEFINE_UNQUOTED(CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size])
])
#
AC_MSG_CHECKING([whether to check invariants (expensive cpu-wise)])
AC_MSG_RESULT([$enable_invariants])
if test x$enable_invariants = xyes ; then
- AC_DEFINE([INVARIANT_CHECK], 1, [enable invariant checking])
+ AC_DEFINE([CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK], 1, [enable invariant checking])
fi
AC_ARG_ENABLE([lu_ref],
__u64 cl_fid_build_ino(const struct lu_fid *fid, int api32);
__u32 cl_fid_build_gen(const struct lu_fid *fid);
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
# define CLOBINVRNT(env, clob, expr) \
do { \
if (unlikely(!(expr))) { \
LINVRNT(0); \
} \
} while (0)
-#else /* !INVARIANT_CHECK */
+#else /* !CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK */
# define CLOBINVRNT(env, clob, expr) \
- ((void)sizeof(env), (void)sizeof(clob), (void)sizeof !!(expr))
-#endif /* !INVARIANT_CHECK */
+ ((void)sizeof(env), (void)sizeof(clob), (void)sizeof !!(expr))
+#endif /* !CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK */
int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp);
int cl_ocd_update(struct obd_device *host,
struct ptlrpc_request_set *set);
#define OBD_RECOVERY_MAX_TIME (obd_timeout * 18) /* b13079 */
+#define OBD_MAX_IOCTL_BUFFER CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER
void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id);
((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
#endif /* !LIBCFS_DEBUG */
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
# define PINVRNT(env, page, expr) \
do { \
if (unlikely(!(expr))) { \
LINVRNT(0); \
} \
} while (0)
-#else /* !INVARIANT_CHECK */
+#else /* !CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK */
# define PINVRNT(env, page, exp) \
- ((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
-#endif /* !INVARIANT_CHECK */
+ ((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
+#endif /* !CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK */
/* Disable page statistic by default due to huge performance penalty. */
#ifdef CONFIG_DEBUG_PAGESTATE_TRACKING
#include <lprocfs_status.h>
#ifndef OBD_MAX_IOCTL_BUFFER
-#define OBD_MAX_IOCTL_BUFFER 8192
+#ifdef CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER
+#define OBD_MAX_IOCTL_BUFFER CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER
+#else
+#define OBD_MAX_IOCTL_BUFFER 8192
+#endif
#endif
/* buffer MUST be at least the size of obd_ioctl_hdr */
*/
int oo_contended;
cfs_time_t oo_contention_time;
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
/**
* IO context used for invariant checks in osc_lock_has_pages().
*/
osc_lock_detach(env, olck);
}
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
static int check_cb(const struct lu_env *env, struct cl_io *io,
struct cl_page *page, void *cbdata)
{
{
return 0;
}
-#endif /* INVARIANT_CHECK */
+#endif /* CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK */
static void osc_lock_delete(const struct lu_env *env,
const struct cl_lock_slice *slice)
int i;
osc->oo_oinfo = cconf->u.coc_oinfo;
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
mutex_init(&osc->oo_debug_mutex);
#endif
spin_lock_init(&osc->oo_seatbelt);
* Cannot assert osc_page_protected() here as read-ahead
* creates temporary pages outside of a lock.
*/
-#ifdef INVARIANT_CHECK
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
opg->ops_temp = !osc_page_protected(env, opg, CLM_READ, 1);
#endif
/* ops_inflight and ops_lru are the same field, but it doesn't