Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b1bec5f authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[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: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e35280e

net/sunrpc/sysctl.c

+1 −7
Original line number Diff line number Diff line
@@ -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

+1 −6
Original line number Diff line number Diff line
@@ -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;