From 691bc0eb299e4c106e55a2d814ae719658f55816 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Jul 2014 23:38:41 -0700 Subject: [PATCH] staging: lustre: remove ctl_table typedefs No need for these, just use the "real" struct the kernel provides. Cc: Andreas Dilger Cc: Oleg Drokin Cc: hpdd-discuss Signed-off-by: Greg Kroah-Hartman --- .../lustre/include/linux/libcfs/linux/linux-prim.h | 3 --- .../include/linux/libcfs/linux/portals_compat25.h | 2 +- drivers/staging/lustre/lnet/lnet/router_proc.c | 6 +++--- .../staging/lustre/lustre/libcfs/linux/linux-proc.c | 12 ++++++------ .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +++--- 5 files changed, 13 insertions(+), 16 deletions(-) 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 1069c33433e9..8125980089e8 100644 --- 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 eae12a6baed0..192ad083931a 100644 --- 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 --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c index 640cdc45975e..394643436af3 100644 --- a/drivers/staging/lustre/lnet/lnet/router_proc.c +++ b/drivers/staging/lustre/lnet/lnet/router_proc.c @@ -30,7 +30,7 @@ /* This is really lnet_proc.c. You might need to update sanity test 215 * if any file format is changed. */ -static ctl_table_header_t *lnet_table_header; +static struct ctl_table_header *lnet_table_header; #define CTL_LNET (0x100) enum { @@ -845,7 +845,7 @@ out: } DECLARE_PROC_HANDLER(proc_lnet_portal_rotor); -static ctl_table_t lnet_table[] = { +static struct ctl_table lnet_table[] = { /* * NB No .strategy entries have been provided since sysctl(8) prefers * to go via /proc for portability. @@ -889,7 +889,7 @@ static ctl_table_t lnet_table[] = { } }; -static ctl_table_t top_table[] = { +static struct ctl_table top_table[] = { { .procname = "lnet", .mode = 0555, diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c index 33fd7ca69e34..c4289b6c8727 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c @@ -65,7 +65,7 @@ #include #include "../tracefile.h" -static ctl_table_header_t *lnet_table_header = NULL; +static struct ctl_table_header *lnet_table_header = NULL; extern char lnet_upcall[1024]; /** * The path of debug log dump upcall script. @@ -217,7 +217,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb) int LL_PROC_PROTO(proc_console_max_delay_cs) { int rc, max_delay_cs; - ctl_table_t dummy = *table; + struct ctl_table dummy = *table; cfs_duration_t d; dummy.data = &max_delay_cs; @@ -248,7 +248,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs) int LL_PROC_PROTO(proc_console_min_delay_cs) { int rc, min_delay_cs; - ctl_table_t dummy = *table; + struct ctl_table dummy = *table; cfs_duration_t d; dummy.data = &min_delay_cs; @@ -279,7 +279,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs) int LL_PROC_PROTO(proc_console_backoff) { int rc, backoff; - ctl_table_t dummy = *table; + struct ctl_table dummy = *table; dummy.data = &backoff; dummy.proc_handler = &proc_dointvec; @@ -363,7 +363,7 @@ static int __proc_cpt_table(void *data, int write, } DECLARE_PROC_HANDLER(proc_cpt_table) -static ctl_table_t lnet_table[] = { +static struct ctl_table lnet_table[] = { /* * NB No .strategy entries have been provided since sysctl(8) prefers * to go via /proc for portability. @@ -516,7 +516,7 @@ static ctl_table_t lnet_table[] = { } }; -static ctl_table_t top_table[] = { +static struct ctl_table top_table[] = { { .procname = "lnet", .mode = 0555, diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c index 70efd6b1b6e9..23f39de9f7ef 100644 --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c @@ -52,7 +52,7 @@ #include "../../include/lprocfs_status.h" #ifdef CONFIG_SYSCTL -ctl_table_header_t *obd_table_header = NULL; +struct ctl_table_header *obd_table_header = NULL; #endif @@ -274,7 +274,7 @@ int LL_PROC_PROTO(proc_at_history) } #ifdef CONFIG_SYSCTL -static ctl_table_t obd_table[] = { +static struct ctl_table obd_table[] = { { .procname = "timeout", .data = &obd_timeout, @@ -390,7 +390,7 @@ static ctl_table_t obd_table[] = { {} }; -static ctl_table_t parent_table[] = { +static struct ctl_table parent_table[] = { { .procname = "lustre", .data = NULL, -- 2.30.2