LU-3963 libcfs: cleanup list operations

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

diff --git a/libcfs/include/libcfs/linux/kp30.h b/libcfs/include/libcfs/linux/kp30.h
index 2c4ecb5..e57f10c 100644 (file)
--- a/libcfs/include/libcfs/linux/kp30.h
+++ b/libcfs/include/libcfs/linux/kp30.h
@@ -73,15 +73,6 @@
 
 #include <libcfs/linux/portals_compat25.h>
 
-/* ------------------------------------------------------------------- */
-
-#define PORTAL_SYMBOL_GET(x) symbol_get(x)
-#define PORTAL_SYMBOL_PUT(x) symbol_put(x)
-
-#define PORTAL_MODULE_USE       try_module_get(THIS_MODULE)
-#define PORTAL_MODULE_UNUSE     module_put(THIS_MODULE)
-
-
 /******************************************************************************/
 /* Module parameter support */
 #define CFS_MODULE_PARM(name, t, type, perm, desc) \
@@ -146,9 +137,9 @@ typedef struct {
 #  if !KLWT_SUPPORT
 
 typedef struct _lwt_page {
-        cfs_list_t               lwtp_list;
-        struct page             *lwtp_page;
-        lwt_event_t             *lwtp_events;
+       struct list_head        lwtp_list;
+       struct page             *lwtp_page;
+       lwt_event_t             *lwtp_events;
 } lwt_page_t;
 
 typedef struct {
@@ -181,12 +172,12 @@ do {                                                                    \
                 p = cpu->lwtc_current_page;                             \
                 e = &p->lwtp_events[cpu->lwtc_current_index++];         \
                                                                         \
-                if (cpu->lwtc_current_index >= LWT_EVENTS_PER_PAGE) {   \
-                        cpu->lwtc_current_page =                        \
-                                cfs_list_entry (p->lwtp_list.next,      \
-                                                lwt_page_t, lwtp_list); \
-                        cpu->lwtc_current_index = 0;                    \
-                }                                                       \
+               if (cpu->lwtc_current_index >= LWT_EVENTS_PER_PAGE) {   \
+                       cpu->lwtc_current_page =                        \
+                               list_entry (p->lwtp_list.next,          \
+                                               lwt_page_t, lwtp_list); \
+                       cpu->lwtc_current_index = 0;                    \
+               }                                                       \
                                                                         \
                 e->lwte_when  = get_cycles();                           \
                 e->lwte_where = LWTWHERE(__FILE__,__LINE__);            \
@@ -278,11 +269,11 @@ extern int  lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size,
 #undef _LWORDSIZE
 
 #ifdef HAVE_SYSCTL_CTLNAME
-#define INIT_CTL_NAME(a) .ctl_name = a,
-#define INIT_STRATEGY(a) .strategy = a,
+#define INIT_CTL_NAME  .ctl_name = CTL_UNNUMBERED,
+#define INIT_STRATEGY  .strategy = &sysctl_intvec,
 #else
-#define INIT_CTL_NAME(a)
-#define INIT_STRATEGY(a)
+#define INIT_CTL_NAME
+#define INIT_STRATEGY
 #endif
 
 #endif