From 62c1b5690d1c786c363d4256749ee005cf874cff Mon Sep 17 00:00:00 2001 From: braam Date: Tue, 15 Jul 2003 00:01:16 +0000 Subject: [PATCH] - remaining b_unify ---> b_ad merge --- lnet/include/linux/kp30.h | 15 ++++++++------- lnet/libcfs/debug.c | 10 +++++----- lnet/libcfs/module.c | 4 ++-- lustre/portals/include/linux/kp30.h | 15 ++++++++------- lustre/portals/libcfs/debug.c | 10 +++++----- lustre/portals/libcfs/module.c | 4 ++-- 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/lnet/include/linux/kp30.h b/lnet/include/linux/kp30.h index 8f3a1ab..3875db9 100644 --- a/lnet/include/linux/kp30.h +++ b/lnet/include/linux/kp30.h @@ -81,10 +81,9 @@ extern unsigned int portal_printk; # include /* THREAD_SIZE */ #else # define THREAD_SIZE 8192 -#endif +#endif #ifdef __KERNEL__ - # ifdef __ia64__ # define CDEBUG_STACK (THREAD_SIZE - \ ((unsigned long)__builtin_dwarf_cfa() & \ @@ -114,13 +113,13 @@ extern unsigned int portal_printk; #if 1 #define CDEBUG(mask, format, a...) \ do { \ - CHECK_STACK(CDEBUG_STACK); \ + CHECK_STACK(CDEBUG_STACK); \ if (!(mask) || ((mask) & (D_ERROR | D_EMERG)) || \ (portal_debug & (mask) && \ portal_subsystem_debug & (1 << (DEBUG_SUBSYSTEM >> 24)))) \ portals_debug_msg(DEBUG_SUBSYSTEM, mask, \ __FILE__, __FUNCTION__, __LINE__, \ - CDEBUG_STACK, format, ## a); \ + CDEBUG_STACK, format, ## a); \ } while (0) #define CWARN(format, a...) CDEBUG(D_WARNING, format, ## a) @@ -212,7 +211,8 @@ static inline void our_cond_resched(void) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) */ #ifdef PORTAL_DEBUG -extern void kportal_assertion_failed(char *expr,char *file,const char *func,const int line); +extern void kportal_assertion_failed(char *expr, char *file, const char *func, + const int line); #define LASSERT(e) ((e) ? 0 : kportal_assertion_failed( #e , __FILE__, \ __FUNCTION__, __LINE__)) #else @@ -580,8 +580,9 @@ __s32 portals_debug_copy_to_user(char *buf, unsigned long len); # warning printf has been defined as a macro... # undef printf #endif -void portals_debug_msg (int subsys, int mask, char *file, const char *fn, const int line, - unsigned long stack, const char *format, ...) +void portals_debug_msg(int subsys, int mask, char *file, const char *fn, + const int line, unsigned long stack, + const char *format, ...) __attribute__ ((format (printf, 7, 8))); #else void portals_debug_msg (int subsys, int mask, char *file, const char *fn, diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c index 2c6ba6c..bc43152 100644 --- a/lnet/libcfs/debug.c +++ b/lnet/libcfs/debug.c @@ -48,7 +48,7 @@ # define DEBUG_SUBSYSTEM S_PORTALS #include -#include +#include #define DEBUG_OVERFLOW 1024 static char *debug_buf = NULL; @@ -633,9 +633,9 @@ int portals_debug_mark_buffer(char *text) if (debug_buf == NULL) return -EINVAL; - CDEBUG(0, "*******************************************************************************\n"); + CDEBUG(0, "********************************************************\n"); CDEBUG(0, "DEBUG MARKER: %s\n", text); - CDEBUG(0, "*******************************************************************************\n"); + CDEBUG(0, "********************************************************\n"); return 0; } @@ -673,8 +673,8 @@ __s32 portals_debug_copy_to_user(char *buf, unsigned long len) /* FIXME: I'm not very smart; someone smarter should make this better. */ void -portals_debug_msg (int subsys, int mask, char *file, const char *fn, const int line, - unsigned long stack, const char *format, ...) +portals_debug_msg(int subsys, int mask, char *file, const char *fn, + const int line, unsigned long stack, const char *format, ...) { va_list ap; unsigned long flags; diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c index 91431cd..e8eb290 100644 --- a/lnet/libcfs/module.c +++ b/lnet/libcfs/module.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include #define PORTAL_MINOR 240 @@ -62,7 +62,7 @@ static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1]; struct semaphore nal_cmd_sem; #ifdef PORTAL_DEBUG -void kportal_assertion_failed(char *expr, char *file, const char *func, +void kportal_assertion_failed(char *expr, char *file, const char *func, const int line) { portals_debug_msg(0, D_EMERG, file, func, line, CDEBUG_STACK, diff --git a/lustre/portals/include/linux/kp30.h b/lustre/portals/include/linux/kp30.h index 8f3a1ab..3875db9 100644 --- a/lustre/portals/include/linux/kp30.h +++ b/lustre/portals/include/linux/kp30.h @@ -81,10 +81,9 @@ extern unsigned int portal_printk; # include /* THREAD_SIZE */ #else # define THREAD_SIZE 8192 -#endif +#endif #ifdef __KERNEL__ - # ifdef __ia64__ # define CDEBUG_STACK (THREAD_SIZE - \ ((unsigned long)__builtin_dwarf_cfa() & \ @@ -114,13 +113,13 @@ extern unsigned int portal_printk; #if 1 #define CDEBUG(mask, format, a...) \ do { \ - CHECK_STACK(CDEBUG_STACK); \ + CHECK_STACK(CDEBUG_STACK); \ if (!(mask) || ((mask) & (D_ERROR | D_EMERG)) || \ (portal_debug & (mask) && \ portal_subsystem_debug & (1 << (DEBUG_SUBSYSTEM >> 24)))) \ portals_debug_msg(DEBUG_SUBSYSTEM, mask, \ __FILE__, __FUNCTION__, __LINE__, \ - CDEBUG_STACK, format, ## a); \ + CDEBUG_STACK, format, ## a); \ } while (0) #define CWARN(format, a...) CDEBUG(D_WARNING, format, ## a) @@ -212,7 +211,8 @@ static inline void our_cond_resched(void) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) */ #ifdef PORTAL_DEBUG -extern void kportal_assertion_failed(char *expr,char *file,const char *func,const int line); +extern void kportal_assertion_failed(char *expr, char *file, const char *func, + const int line); #define LASSERT(e) ((e) ? 0 : kportal_assertion_failed( #e , __FILE__, \ __FUNCTION__, __LINE__)) #else @@ -580,8 +580,9 @@ __s32 portals_debug_copy_to_user(char *buf, unsigned long len); # warning printf has been defined as a macro... # undef printf #endif -void portals_debug_msg (int subsys, int mask, char *file, const char *fn, const int line, - unsigned long stack, const char *format, ...) +void portals_debug_msg(int subsys, int mask, char *file, const char *fn, + const int line, unsigned long stack, + const char *format, ...) __attribute__ ((format (printf, 7, 8))); #else void portals_debug_msg (int subsys, int mask, char *file, const char *fn, diff --git a/lustre/portals/libcfs/debug.c b/lustre/portals/libcfs/debug.c index 2c6ba6c..bc43152 100644 --- a/lustre/portals/libcfs/debug.c +++ b/lustre/portals/libcfs/debug.c @@ -48,7 +48,7 @@ # define DEBUG_SUBSYSTEM S_PORTALS #include -#include +#include #define DEBUG_OVERFLOW 1024 static char *debug_buf = NULL; @@ -633,9 +633,9 @@ int portals_debug_mark_buffer(char *text) if (debug_buf == NULL) return -EINVAL; - CDEBUG(0, "*******************************************************************************\n"); + CDEBUG(0, "********************************************************\n"); CDEBUG(0, "DEBUG MARKER: %s\n", text); - CDEBUG(0, "*******************************************************************************\n"); + CDEBUG(0, "********************************************************\n"); return 0; } @@ -673,8 +673,8 @@ __s32 portals_debug_copy_to_user(char *buf, unsigned long len) /* FIXME: I'm not very smart; someone smarter should make this better. */ void -portals_debug_msg (int subsys, int mask, char *file, const char *fn, const int line, - unsigned long stack, const char *format, ...) +portals_debug_msg(int subsys, int mask, char *file, const char *fn, + const int line, unsigned long stack, const char *format, ...) { va_list ap; unsigned long flags; diff --git a/lustre/portals/libcfs/module.c b/lustre/portals/libcfs/module.c index 91431cd..e8eb290 100644 --- a/lustre/portals/libcfs/module.c +++ b/lustre/portals/libcfs/module.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include #define PORTAL_MINOR 240 @@ -62,7 +62,7 @@ static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1]; struct semaphore nal_cmd_sem; #ifdef PORTAL_DEBUG -void kportal_assertion_failed(char *expr, char *file, const char *func, +void kportal_assertion_failed(char *expr, char *file, const char *func, const int line) { portals_debug_msg(0, D_EMERG, file, func, line, CDEBUG_STACK, -- 1.8.3.1