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

Commit 20fbff1d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h

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

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

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



/**