diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 21:26:09 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 21:26:09 -0700 |
commit | 1d3ade00c6d3279c1e078137a3bc2fab7c6d715a (patch) | |
tree | 19a6174e0171d64ba51af4fbbfdaa00b6619712f /drivers/staging/lustre/lustre/obdclass/linux | |
parent | ceeb4aef56508768da351c3c1bb0e607dc82a8cf (diff) |
staging: lustre: remove proc function wrappers
ll_proc_dointvec and ll_proc_dolongvec didn't do anything except confuse
things due to a lack of a filep variable in the functions they were used
in. So remove them and just call the real proc functions. This enabled
the code to be unwound a bit and a few "empty" proc handlers were
removed and just passed directly to procfs instead.
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/obdclass/linux')
-rw-r--r-- | drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c index 5a36930e8fbb..a4cd46b182d9 100644 --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c @@ -84,7 +84,7 @@ int proc_set_timeout(struct ctl_table *table, int write, void __user *buffer, { int rc; - rc = ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); + rc = proc_dointvec(table, write, buffer, lenp, ppos); if (ldlm_timeout >= obd_timeout) ldlm_timeout = max(obd_timeout / 3, 1U); return rc; @@ -259,36 +259,6 @@ int proc_alloc_fail_rate(struct ctl_table *table, int write, return rc; } -int proc_at_min(struct ctl_table *table, int write, void __user *buffer, - size_t *lenp, loff_t *ppos) -{ - return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); -} - -int proc_at_max(struct ctl_table *table, int write, void __user *buffer, - size_t *lenp, loff_t *ppos) -{ - return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); -} - -int proc_at_extra(struct ctl_table *table, int write, void __user *buffer, - size_t *lenp, loff_t *ppos) -{ - return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); -} - -int proc_at_early_margin(struct ctl_table *table, int write, - void __user *buffer, size_t *lenp, loff_t *ppos) -{ - return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); -} - -int proc_at_history(struct ctl_table *table, int write, void __user *buffer, - size_t *lenp, loff_t *ppos) -{ - return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); -} - #ifdef CONFIG_SYSCTL static struct ctl_table obd_table[] = { { @@ -373,35 +343,35 @@ static struct ctl_table obd_table[] = { .data = &at_min, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_at_min + .proc_handler = &proc_dointvec, }, { .procname = "at_max", .data = &at_max, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_at_max + .proc_handler = &proc_dointvec, }, { .procname = "at_extra", .data = &at_extra, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_at_extra + .proc_handler = &proc_dointvec, }, { .procname = "at_early_margin", .data = &at_early_margin, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_at_early_margin + .proc_handler = &proc_dointvec, }, { .procname = "at_history", .data = &at_history, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_at_history + .proc_handler = &proc_dointvec, }, {} }; |