LU-6245 libcfs: remove types abstraction from libcfs/LNet 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 f390367..b481bbe 100644 (file)
--- a/libcfs/include/libcfs/libcfs_debug.h
+++ b/libcfs/include/libcfs/libcfs_debug.h
@@ -174,7 +174,7 @@ struct ptldebug_header {
 #define CDEBUG_DEFAULT_MIN_DELAY ((cfs_time_seconds(1) + 1) / 2) /* jiffies */
 #define CDEBUG_DEFAULT_BACKOFF   2
 struct cfs_debug_limit_state {
-       cfs_time_t      cdls_next;
+       unsigned long   cdls_next;
        unsigned int    cdls_delay;
        int             cdls_count;
 };
@@ -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;                                            \
        }                                                               \
                                                                        \