summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h5
-rw-r--r--drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h3
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index dd8ac2f..07082dc 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -272,7 +272,6 @@ long libcfs_log_return(struct libcfs_debug_msg_data *, long rc);
#if BITS_PER_LONG > 32
#define RETURN(rc) \
do { \
- EXIT_NESTING; \
if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) { \
LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_TRACE, NULL); \
return (typeof(rc))libcfs_log_return(&msgdata, \
@@ -289,7 +288,6 @@ do { \
*/
#define RETURN(rc) \
do { \
- EXIT_NESTING; \
if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) { \
typeof(rc) __rc = (rc); \
LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_TRACE, NULL); \
@@ -305,7 +303,6 @@ do { \
#define RETURN(rc) \
do { \
CDEBUG(D_TRACE, "Process leaving.\n"); \
- EXIT_NESTING; \
return (rc); \
} while (0)
#else
@@ -313,7 +310,6 @@ do { \
#endif /* __GNUC__ */
#define ENTRY \
-ENTRY_NESTING; \
do { \
CDEBUG(D_TRACE, "Process entered\n"); \
} while (0)
@@ -321,7 +317,6 @@ do { \
#define EXIT \
do { \
CDEBUG(D_TRACE, "Process leaving\n"); \
- EXIT_NESTING; \
} while(0)
#define RETURN_EXIT \
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
index 292a3ba..60ecaf6 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
@@ -97,9 +97,6 @@ do { \
/* initial pid */
#define LUSTRE_LNET_PID 12345
-#define ENTRY_NESTING_SUPPORT (1)
-#define ENTRY_NESTING do {;} while (0)
-#define EXIT_NESTING do {;} while (0)
#define __current_nesting_level() (0)
/**