From 2b1bec5f52fec033ed0026e7d85f641e20e1cbb9 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Wed, 14 Feb 2007 00:33:24 -0800 Subject: [PATCH] [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 Cc: Trond Myklebust Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- net/sunrpc/sysctl.c | 8 +------- 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 64ce7098f5..1169798bf2 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 389b118091..5a9f6d840e 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; -- 2.39.5