staging: lustre: remove ctl_table typedefs

No need for these, just use the "real" struct the kernel provides.

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 1069c33433e9ea72a3909f286cf08f2ea5be4729..8125980089e85cb677f63b4d52c0bd27caca41c4 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -64,9 +64,6 @@
 /*
  * Sysctl register
  */
-typedef struct ctl_table               ctl_table_t;
-typedef struct ctl_table_header                ctl_table_header_t;
-
 #define DECLARE_PROC_HANDLER(name)                   \
 static int                                           \
 LL_PROC_PROTO(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 eae12a6baed02701d8672841bf4b4a2ed8651e5f..192ad083931a7d71985b0461fd1e16ad323340cb 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
@@ -86,7 +86,7 @@
 #define ll_proc_dostring(table, write, filp, buffer, lenp, ppos)       \
        proc_dostring(table, write, buffer, lenp, ppos);
 #define LL_PROC_PROTO(name)                                         \
-       name(ctl_table_t *table, int write,                   \
+       name(struct ctl_table *table, int write,                      \
             void __user *buffer, size_t *lenp, loff_t *ppos)
 
 /* helper for sysctl handlers */

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

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