staging: lustre: remove unneeded DECLARE_LL_PROC_PPOS_DECL macro

It did nothing, so remove it.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
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 b24bc6b..1069c33 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -71,8 +71,6 @@ typedef struct ctl_table_header               ctl_table_header_t;
 static int                                           \
 LL_PROC_PROTO(name)                                 \
 {                                                     \
-       DECLARE_LL_PROC_PPOS_DECL;                    \
-                                                       \
        return proc_call_handler(table->data, write,    \
                                 ppos, buffer, lenp,    \
                                 __##name);          \

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 c6fa7ca..eae12a6 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
@@ -88,7 +88,6 @@
 #define LL_PROC_PROTO(name)                                         \
        name(ctl_table_t *table, int write,                   \
             void __user *buffer, size_t *lenp, loff_t *ppos)
-#define DECLARE_LL_PROC_PPOS_DECL
 
 /* helper for sysctl handlers */
 int proc_call_handler(void *data, int write,

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

diff --cc drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
Simple merge