LU-8058 lnet: Remove old commented out code

[fs/lustre-release.git] / libcfs / include / libcfs / libcfs_debug.h

diff --git a/libcfs/include/libcfs/libcfs_debug.h b/libcfs/include/libcfs/libcfs_debug.h
index fc89ce8..b481bbe 100644 (file)
--- a/libcfs/include/libcfs/libcfs_debug.h
+++ b/libcfs/include/libcfs/libcfs_debug.h
@@ -173,19 +173,19 @@ struct ptldebug_header {
 #define CDEBUG_DEFAULT_MAX_DELAY (cfs_time_seconds(600))         /* jiffies */
 #define CDEBUG_DEFAULT_MIN_DELAY ((cfs_time_seconds(1) + 1) / 2) /* jiffies */
 #define CDEBUG_DEFAULT_BACKOFF   2
-typedef struct {
-        cfs_time_t      cdls_next;
-        unsigned int    cdls_delay;
-        int             cdls_count;
-} cfs_debug_limit_state_t;
+struct cfs_debug_limit_state {
+       unsigned long   cdls_next;
+       unsigned int    cdls_delay;
+       int             cdls_count;
+};
 
 struct libcfs_debug_msg_data {
-        const char               *msg_file;
-        const char               *msg_fn;
-        int                      msg_subsys;
-        int                      msg_line;
-        int                      msg_mask;
-        cfs_debug_limit_state_t  *msg_cdls;
+       const char                      *msg_file;
+       const char                      *msg_fn;
+       int                              msg_subsys;
+       int                              msg_line;
+       int                              msg_mask;
+       struct cfs_debug_limit_state    *msg_cdls;
 };
 
 #define LIBCFS_DEBUG_MSG_DATA_INIT(data, mask, cdls)        \
@@ -234,11 +234,11 @@ do {                                                                    \
 
 #  define CDEBUG(mask, format, ...) __CDEBUG(NULL, mask, format, ## __VA_ARGS__)
 
-#  define CDEBUG_LIMIT(mask, format, ...)      \
-do {                                            \
-        static cfs_debug_limit_state_t cdls;    \
-                                                \
-        __CDEBUG(&cdls, mask, format, ## __VA_ARGS__);\
+#  define CDEBUG_LIMIT(mask, format, ...)                              \
+do {                                                                   \
+       static struct cfs_debug_limit_state cdls;                       \
+                                                                       \
+       __CDEBUG(&cdls, mask, format, ## __VA_ARGS__);                  \
 } while (0)
 
 # else /* !CDEBUG_ENABLED */
@@ -291,13 +291,13 @@ do {                                                                    \
 #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);
+                    const char *label, long rc);
 
 # define GOTO(label, rc)                                               \
 do {                                                                   \
        if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) {                \
                LIBCFS_DEBUG_MSG_DATA_DECL(_goto_data, D_TRACE, NULL);  \
-               libcfs_log_goto(&_goto_data, #label, (long_ptr_t)(rc)); \
+               libcfs_log_goto(&_goto_data, #label, (long)(rc));       \
        } else {                                                        \
                (void)(rc);                                             \
        }                                                               \
@@ -329,7 +329,7 @@ do {                                                                        \
        if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) {                \
                typeof(rc) __rc = (rc);                                 \
                LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_TRACE, NULL);     \
-               libcfs_log_return(&msgdata, (long_ptr_t)__rc);          \
+               libcfs_log_return(&msgdata, (long)__rc);                \
                return __rc;                                            \
        }                                                               \
                                                                        \
@@ -370,12 +370,14 @@ extern int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
                               va_list args, const char *format2, ...)
         __attribute__ ((format (printf, 4, 5)));
 
+#ifdef __KERNEL__
 /* other external symbols that tracefile provides: */
 extern int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob,
                                   const char __user *usr_buffer,
                                   int usr_buffer_nob);
 extern int cfs_trace_copyout_string(char __user *usr_buffer, int usr_buffer_nob,
                                    const char *knl_buffer, char *append);
+#endif /* __KERNEL__ */
 
 #define LIBCFS_DEBUG_FILE_PATH_DEFAULT "/tmp/lustre-log"