In userspace define GOTO() and RETURN() to not call libcfs_log_goto()
or libcfs_log_return(). Remove the definition of uses of the obsolete
__arch_lib__ symbol.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I55411d57e0cb00e3e742b011317244b452c23f6a
Reviewed-on: http://review.whamcloud.com/12281
Tested-by: Jenkins
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
-LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
+LLCPPFLAGS="-D_LARGEFILE64_SOURCE=1"
AC_SUBST(LLCPPFLAGS)
# Add _GNU_SOURCE for strnlen on linux
AC_SUBST(LLCPPFLAGS)
# Add _GNU_SOURCE for strnlen on linux
.msg_cdls = (cdls) }; \
dataname.msg_mask = (mask);
.msg_cdls = (cdls) }; \
dataname.msg_mask = (mask);
-#if defined(__KERNEL__) || (defined(__arch_lib__) && !defined(LUSTRE_UTILS))
/**
* Filters out logging messages based on mask and subsystem.
/**
* Filters out logging messages based on mask and subsystem.
((libcfs_debug & mask) && (libcfs_subsystem_debug & subsystem));
}
((libcfs_debug & mask) && (libcfs_subsystem_debug & subsystem));
}
-#define __CDEBUG(cdls, mask, format, ...) \
+# define __CDEBUG(cdls, mask, format, ...) \
do { \
static struct libcfs_debug_msg_data msgdata; \
\
do { \
static struct libcfs_debug_msg_data msgdata; \
\
-#define CDEBUG(mask, format, ...) __CDEBUG(NULL, mask, format, ## __VA_ARGS__)
+# define CDEBUG(mask, format, ...) __CDEBUG(NULL, mask, format, ## __VA_ARGS__)
-#define CDEBUG_LIMIT(mask, format, ...) \
+# define CDEBUG_LIMIT(mask, format, ...) \
do { \
static cfs_debug_limit_state_t cdls; \
\
__CDEBUG(&cdls, mask, format, ## __VA_ARGS__);\
} while (0)
do { \
static cfs_debug_limit_state_t cdls; \
\
__CDEBUG(&cdls, mask, format, ## __VA_ARGS__);\
} while (0)
-#else /* !CDEBUG_ENABLED */
+# else /* !CDEBUG_ENABLED */
static inline int cfs_cdebug_show(unsigned int mask, unsigned int subsystem)
{
return 0;
}
static inline int cfs_cdebug_show(unsigned int mask, unsigned int subsystem)
{
return 0;
}
-#define CDEBUG(mask, format, ...) (void)(0)
-#define CDEBUG_LIMIT(mask, format, ...) (void)(0)
-#warning "CDEBUG IS DISABLED. THIS SHOULD NEVER BE DONE FOR PRODUCTION!"
-#endif
+# define CDEBUG(mask, format, ...) (void)(0)
+# define CDEBUG_LIMIT(mask, format, ...) (void)(0)
+# warning "CDEBUG IS DISABLED. THIS SHOULD NEVER BE DONE FOR PRODUCTION!"
+# endif /* CDEBUG_ENABLED */
-#else /* !__KERNEL__ && (!__arch_lib__ || LUSTRE_UTILS) */
static inline int cfs_cdebug_show(unsigned int mask, unsigned int subsystem)
{
return 0;
}
static inline int cfs_cdebug_show(unsigned int mask, unsigned int subsystem)
{
return 0;
}
-#define CDEBUG(mask, format, ...) \
+# define CDEBUG(mask, format, ...) \
do { \
if (((mask) & D_CANTMASK) != 0) \
fprintf(stderr, "(%s:%d:%s()) " format, \
__FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__);\
} while (0)
do { \
if (((mask) & D_CANTMASK) != 0) \
fprintf(stderr, "(%s:%d:%s()) " format, \
__FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__);\
} while (0)
-#define CDEBUG_LIMIT CDEBUG
-
-#endif /* !__KERNEL__ ... */
+# define CDEBUG_LIMIT CDEBUG
#define CWARN(format, ...) CDEBUG_LIMIT(D_WARNING, format, ## __VA_ARGS__)
#define CERROR(format, ...) CDEBUG_LIMIT(D_ERROR, format, ## __VA_ARGS__)
#define CWARN(format, ...) CDEBUG_LIMIT(D_WARNING, format, ## __VA_ARGS__)
#define CERROR(format, ...) CDEBUG_LIMIT(D_ERROR, format, ## __VA_ARGS__)
#define LCONSOLE_EMERG(format, ...) CDEBUG(D_CONSOLE | D_EMERG, format, ## __VA_ARGS__)
#define LCONSOLE_EMERG(format, ...) CDEBUG(D_CONSOLE | D_EMERG, format, ## __VA_ARGS__)
-#ifdef CDEBUG_ENTRY_EXIT
+#if defined(CDEBUG_ENTRY_EXIT) && defined(__KERNEL__)
void libcfs_log_goto(struct libcfs_debug_msg_data *goto_data,
const char *label, long_ptr_t rc);
void libcfs_log_goto(struct libcfs_debug_msg_data *goto_data,
const char *label, long_ptr_t rc);
long libcfs_log_return(struct libcfs_debug_msg_data *, long rc);
long libcfs_log_return(struct libcfs_debug_msg_data *, long rc);
-#if BITS_PER_LONG > 32
-#define RETURN(rc) \
+# if BITS_PER_LONG > 32
+# define RETURN(rc) \
do { \
if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) { \
LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_TRACE, NULL); \
do { \
if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) { \
LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_TRACE, NULL); \
\
return (rc); \
} while (0)
\
return (rc); \
} while (0)
-#else /* BITS_PER_LONG == 32 */
+# else /* BITS_PER_LONG == 32 */
/* We need an on-stack variable, because we cannot case a 32-bit pointer
* directly to (long long) without generating a complier warning/error, yet
* casting directly to (long) will truncate 64-bit return values. The log
* values will print as 32-bit values, but they always have been. LU-1436
*/
/* We need an on-stack variable, because we cannot case a 32-bit pointer
* directly to (long long) without generating a complier warning/error, yet
* casting directly to (long) will truncate 64-bit return values. The log
* values will print as 32-bit values, but they always have been. LU-1436
*/
do { \
if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) { \
typeof(rc) __rc = (rc); \
do { \
if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) { \
typeof(rc) __rc = (rc); \
\
return (rc); \
} while (0)
\
return (rc); \
} while (0)
-#endif /* BITS_PER_LONG > 32 */
-#define ENTRY CDEBUG(D_TRACE, "Process entered\n")
-#define EXIT CDEBUG(D_TRACE, "Process leaving\n")
+# endif /* BITS_PER_LONG > 32 */
+
+# define ENTRY CDEBUG(D_TRACE, "Process entered\n")
+# define EXIT CDEBUG(D_TRACE, "Process leaving\n")
-#else /* !CDEBUG_ENTRY_EXIT */
+#else /* !CDEBUG_ENTRY_EXIT || !__KERNEL__ */
# define GOTO(label, rc) \
do { \
# define GOTO(label, rc) \
do { \
goto label; \
} while (0)
goto label; \
} while (0)
-#define RETURN(rc) return (rc)
-#define ENTRY do { } while (0)
-#define EXIT do { } while (0)
+# define RETURN(rc) return (rc)
+# define ENTRY do { } while (0)
+# define EXIT do { } while (0)
-#endif /* !CDEBUG_ENTRY_EXIT */
+#endif /* CDEBUG_ENTRY_EXIT && __KERNEL__ */
#define RETURN_EXIT \
do { \
#define RETURN_EXIT \
do { \