projects/linux·commit 2b1bec5f

[PATCH] sysctl: sunrpc: don't unnecessarily set ctl_table->de

2b1bec5f · Eric W. Biederman <[email protected]> · 2007-02-14 00:33:24 -08:00

We don't need this to prevent module unload races so remove the unnecessary
code.

Signed-off-by: Eric W. Biederman <[email protected]>
Cc: Trond Myklebust <[email protected]>
Cc: Neil Brown <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
2b1bec5f52fec033ed0026e7d85f641e20e1cbb9
Parents
7e35280e

Changes

2 files changed · +2 −13

FileStatusAddDelContent
net/sunrpc/sysctl.cmodified+1−7View file
net/sunrpc/xprtsock.cmodified+1−6View file

net/sunrpc/sysctl.c

View file
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 64ce709..1169798 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

net/sunrpc/xprtsock.c

View file
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 389b118..5a9f6d8 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;