Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9733ac33 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68b636b6

drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

+0 −9
Original line number Diff line number Diff line
@@ -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

drivers/staging/lustre/lustre/libcfs/debug.c

+5 −3
Original line number Diff line number Diff line
@@ -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)