staging: lustre: remove strange journal macros into the one file using them

This moves the PUSH_JOURNAL and friend macros into debug.c, as that's
the only place they are used, so why are they even a macro?

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/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index c78f71a23592284d9de4a3efcf532f6b77de2434..383198acb1f4788d412f628751bac7491a8391ff 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -85,13 +85,4 @@ LL_PROC_PROTO(name)                               \
  */
 typedef struct proc_dir_entry     proc_dir_entry_t;
 
-#define DECL_JOURNAL_DATA         void *journal_info
-#define PUSH_JOURNAL           do {    \
-       journal_info = current->journal_info;   \
-       current->journal_info = NULL;      \
-       } while(0)
-#define POP_JOURNAL             do {    \
-       current->journal_info = journal_info;   \
-       } while(0)
-
 #endif

diff --git a/drivers/staging/lustre/lustre/libcfs/debug.c b/drivers/staging/lustre/lustre/libcfs/debug.c
index f7216de4cb4f14fcfc9f11efb9e8d8ee49ab5d0a..9b9c45116eee7bc26b08eee26eeca37bb1940fdd 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/debug.c
+++ b/drivers/staging/lustre/lustre/libcfs/debug.c
@@ -335,9 +335,10 @@ libcfs_debug_str2mask(int *mask, const char *str, int is_subsys)
  */
 void libcfs_debug_dumplog_internal(void *arg)
 {
-       DECL_JOURNAL_DATA;
+       void *journal_info;
 
-       PUSH_JOURNAL;
+       journal_info = current->journal_info;
+       current->journal_info = NULL;
 
        if (strncmp(libcfs_debug_file_path_arr, "NONE", 4) != 0) {
                snprintf(debug_file_name, sizeof(debug_file_name) - 1,
@@ -348,7 +349,8 @@ void libcfs_debug_dumplog_internal(void *arg)
                cfs_tracefile_dump_all_pages(debug_file_name);
                libcfs_run_debug_log_upcall(debug_file_name);
        }
-       POP_JOURNAL;
+
+       current->journal_info = journal_info;
 }
 
 int libcfs_debug_dumplog_thread(void *arg)