staging: lustre: remove ENTRY/EXIT_NESTING stuff

These macros were empty, so remove them in anticipation of removing the
entire ENTRY/EXIT macros.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index dd8ac2f52c9f83e299ebe09c782b1550af4a3bcb..07082dc6fd861f3c93c74703f3188358320d7a1b 100644 (file)
--- 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 292a3ba1fb96c4191b58131307b37fddcf37a0eb..60ecaf63f9fb10d996cbc6a2b6aeb43cfe186a66 100644 (file)
--- 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)
 
 /**