diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2007-02-14 00:33:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 08:09:55 -0800 |
| commit | 2b1bec5f52fec033ed0026e7d85f641e20e1cbb9 (patch) | |
| tree | b40e7602e530db4772a0a8b86762cc82413163e3 | |
| parent | 7e35280e517c28b991667a608990227503dd2a30 (diff) | |
| download | linux-2b1bec5f52fec033ed0026e7d85f641e20e1cbb9.tar.gz linux-2b1bec5f52fec033ed0026e7d85f641e20e1cbb9.tar.bz2 linux-2b1bec5f52fec033ed0026e7d85f641e20e1cbb9.zip | |
[PATCH] sysctl: sunrpc: don't unnecessarily set ctl_table->de
We don't need this to prevent module unload races so remove the unnecessary
code.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | net/sunrpc/sysctl.c | 8 | ||||
| -rw-r--r-- | net/sunrpc/xprtsock.c | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index 64ce7098f541..1169798bf271 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c @@ -35,14 +35,8 @@ static ctl_table sunrpc_table[]; void rpc_register_sysctl(void) { - if (!sunrpc_table_header) { + if (!sunrpc_table_header) sunrpc_table_header = register_sysctl_table(sunrpc_table, 0); -#ifdef CONFIG_PROC_FS - if (sunrpc_table[0].de) - sunrpc_table[0].de->owner = THIS_MODULE; -#endif - } - } void diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 389b1180911a..5a9f6d840e82 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1635,13 +1635,8 @@ struct rpc_xprt *xs_setup_tcp(struct sockaddr *addr, size_t addrlen, struct rpc_ int init_socket_xprt(void) { #ifdef RPC_DEBUG - if (!sunrpc_table_header) { + if (!sunrpc_table_header) sunrpc_table_header = register_sysctl_table(sunrpc_table, 0); -#ifdef CONFIG_PROC_FS - if (sunrpc_table[0].de) - sunrpc_table[0].de->owner = THIS_MODULE; -#endif - } #endif return 0; |