mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
0b4d414714
The semantic effect of insert_at_head is that it would allow new registered sysctl entries to override existing sysctl entries of the same name. Which is pain for caching and the proc interface never implemented. I have done an audit and discovered that none of the current users of register_sysctl care as (excpet for directories) they do not register duplicate sysctl entries. So this patch simply removes the support for overriding existing entries in the sys_sysctl interface since no one uses it or cares and it makes future enhancments harder. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Russell King <rmk@arm.linux.org.uk> Cc: David Howells <dhowells@redhat.com> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Andi Kleen <ak@muc.de> Cc: Jens Axboe <axboe@kernel.dk> Cc: Corey Minyard <minyard@acm.org> Cc: Neil Brown <neilb@suse.de> Cc: "John W. Linville" <linville@tuxdriver.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Jan Kara <jack@ucw.cz> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Cc: Mark Fasheh <mark.fasheh@oracle.com> Cc: David Chinner <dgc@sgi.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Patrick McHardy <kaber@trash.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
162 lines
3.1 KiB
C
162 lines
3.1 KiB
C
/*
|
|
* linux/net/sunrpc/sysctl.c
|
|
*
|
|
* Sysctl interface to sunrpc module.
|
|
*
|
|
* I would prefer to register the sunrpc table below sys/net, but that's
|
|
* impossible at the moment.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/linkage.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/sysctl.h>
|
|
#include <linux/module.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <linux/sunrpc/types.h>
|
|
#include <linux/sunrpc/sched.h>
|
|
#include <linux/sunrpc/stats.h>
|
|
|
|
/*
|
|
* Declare the debug flags here
|
|
*/
|
|
unsigned int rpc_debug;
|
|
unsigned int nfs_debug;
|
|
unsigned int nfsd_debug;
|
|
unsigned int nlm_debug;
|
|
|
|
#ifdef RPC_DEBUG
|
|
|
|
static struct ctl_table_header *sunrpc_table_header;
|
|
static ctl_table sunrpc_table[];
|
|
|
|
void
|
|
rpc_register_sysctl(void)
|
|
{
|
|
if (!sunrpc_table_header)
|
|
sunrpc_table_header = register_sysctl_table(sunrpc_table);
|
|
}
|
|
|
|
void
|
|
rpc_unregister_sysctl(void)
|
|
{
|
|
if (sunrpc_table_header) {
|
|
unregister_sysctl_table(sunrpc_table_header);
|
|
sunrpc_table_header = NULL;
|
|
}
|
|
}
|
|
|
|
static int
|
|
proc_dodebug(ctl_table *table, int write, struct file *file,
|
|
void __user *buffer, size_t *lenp, loff_t *ppos)
|
|
{
|
|
char tmpbuf[20], c, *s;
|
|
char __user *p;
|
|
unsigned int value;
|
|
size_t left, len;
|
|
|
|
if ((*ppos && !write) || !*lenp) {
|
|
*lenp = 0;
|
|
return 0;
|
|
}
|
|
|
|
left = *lenp;
|
|
|
|
if (write) {
|
|
if (!access_ok(VERIFY_READ, buffer, left))
|
|
return -EFAULT;
|
|
p = buffer;
|
|
while (left && __get_user(c, p) >= 0 && isspace(c))
|
|
left--, p++;
|
|
if (!left)
|
|
goto done;
|
|
|
|
if (left > sizeof(tmpbuf) - 1)
|
|
return -EINVAL;
|
|
if (copy_from_user(tmpbuf, p, left))
|
|
return -EFAULT;
|
|
tmpbuf[left] = '\0';
|
|
|
|
for (s = tmpbuf, value = 0; '0' <= *s && *s <= '9'; s++, left--)
|
|
value = 10 * value + (*s - '0');
|
|
if (*s && !isspace(*s))
|
|
return -EINVAL;
|
|
while (left && isspace(*s))
|
|
left--, s++;
|
|
*(unsigned int *) table->data = value;
|
|
/* Display the RPC tasks on writing to rpc_debug */
|
|
if (table->ctl_name == CTL_RPCDEBUG) {
|
|
rpc_show_tasks();
|
|
}
|
|
} else {
|
|
if (!access_ok(VERIFY_WRITE, buffer, left))
|
|
return -EFAULT;
|
|
len = sprintf(tmpbuf, "%d", *(unsigned int *) table->data);
|
|
if (len > left)
|
|
len = left;
|
|
if (__copy_to_user(buffer, tmpbuf, len))
|
|
return -EFAULT;
|
|
if ((left -= len) > 0) {
|
|
if (put_user('\n', (char __user *)buffer + len))
|
|
return -EFAULT;
|
|
left--;
|
|
}
|
|
}
|
|
|
|
done:
|
|
*lenp -= left;
|
|
*ppos += *lenp;
|
|
return 0;
|
|
}
|
|
|
|
|
|
static ctl_table debug_table[] = {
|
|
{
|
|
.ctl_name = CTL_RPCDEBUG,
|
|
.procname = "rpc_debug",
|
|
.data = &rpc_debug,
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = &proc_dodebug
|
|
},
|
|
{
|
|
.ctl_name = CTL_NFSDEBUG,
|
|
.procname = "nfs_debug",
|
|
.data = &nfs_debug,
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = &proc_dodebug
|
|
},
|
|
{
|
|
.ctl_name = CTL_NFSDDEBUG,
|
|
.procname = "nfsd_debug",
|
|
.data = &nfsd_debug,
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = &proc_dodebug
|
|
},
|
|
{
|
|
.ctl_name = CTL_NLMDEBUG,
|
|
.procname = "nlm_debug",
|
|
.data = &nlm_debug,
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = &proc_dodebug
|
|
},
|
|
{ .ctl_name = 0 }
|
|
};
|
|
|
|
static ctl_table sunrpc_table[] = {
|
|
{
|
|
.ctl_name = CTL_SUNRPC,
|
|
.procname = "sunrpc",
|
|
.mode = 0555,
|
|
.child = debug_table
|
|
},
|
|
{ .ctl_name = 0 }
|
|
};
|
|
|
|
#endif
|