aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 03:33:24 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:55 -0500
commit2b1bec5f52fec033ed0026e7d85f641e20e1cbb9 (patch)
treeb40e7602e530db4772a0a8b86762cc82413163e3 /net/sunrpc
parent7e35280e517c28b991667a608990227503dd2a30 (diff)
[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>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/sysctl.c8
-rw-r--r--net/sunrpc/xprtsock.c7
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[];
35void 35void
36rpc_register_sysctl(void) 36rpc_register_sysctl(void)
37{ 37{
38 if (!sunrpc_table_header) { 38 if (!sunrpc_table_header)
39 sunrpc_table_header = register_sysctl_table(sunrpc_table, 0); 39 sunrpc_table_header = register_sysctl_table(sunrpc_table, 0);
40#ifdef CONFIG_PROC_FS
41 if (sunrpc_table[0].de)
42 sunrpc_table[0].de->owner = THIS_MODULE;
43#endif
44 }
45
46} 40}
47 41
48void 42void
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_
1635int init_socket_xprt(void) 1635int init_socket_xprt(void)
1636{ 1636{
1637#ifdef RPC_DEBUG 1637#ifdef RPC_DEBUG
1638 if (!sunrpc_table_header) { 1638 if (!sunrpc_table_header)
1639 sunrpc_table_header = register_sysctl_table(sunrpc_table, 0); 1639 sunrpc_table_header = register_sysctl_table(sunrpc_table, 0);
1640#ifdef CONFIG_PROC_FS
1641 if (sunrpc_table[0].de)
1642 sunrpc_table[0].de->owner = THIS_MODULE;
1643#endif
1644 }
1645#endif 1640#endif
1646 1641
1647 return 0; 1642 return 0;