staging: lustre: clean up some proc file declarations

This removes the DECLARE_PROC_HANDLER macro, and makes proc_call_handler
a static function (horrible name to be in a module).  This makes the
linux-prim.h file empty now, so it can be removed soon.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index 43ce3a0..8ea8576 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -61,16 +61,4 @@
 
 #include "linux-time.h"
 
-/*
- * Sysctl register
- */
-#define DECLARE_PROC_HANDLER(name)                                     \
-static int name(struct ctl_table *table, int write,                    \
-               void __user *buffer, size_t *lenp, loff_t *ppos)        \
-{                                                                      \
-       return proc_call_handler(table->data, write,                    \
-                                ppos, buffer, lenp,                    \
-                                __##name);                             \
-}
-
 #endif

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
index 4fe0720..0728f20 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
@@ -84,10 +84,4 @@
 #define ll_proc_dolongvec(table, write, filp, buffer, lenp, ppos)      \
        proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
 
-/* helper for sysctl handlers */
-int proc_call_handler(void *data, int write,
-                     loff_t *ppos, void *buffer, size_t *lenp,
-                     int (*handler)(void *data, int write,
-                                    loff_t pos, void *buffer, int len));
-
 #endif /* _PORTALS_COMPAT_H */

diff --cc drivers/staging/lustre/lnet/lnet/router_proc.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
Simple merge