Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 2b1bec5f52fec033ed0026e7d85f641e20e1cbb9

Authored by Eric W. Biederman
Committed by Linus Torvalds
1 parent 7e35280e51
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[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>

Showing 2 changed files with 2 additions and 13 deletions Side-by-side Diff

... ... @@ -35,14 +35,8 @@
35 35 void
36 36 rpc_register_sysctl(void)
37 37 {
38   - if (!sunrpc_table_header) {
  38 + if (!sunrpc_table_header)
39 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  
48 42 void
net/sunrpc/xprtsock.c
Diff comments   View file @ 2b1bec5
... ... @@ -1635,13 +1635,8 @@
1635 1635 int init_socket_xprt(void)
1636 1636 {
1637 1637 #ifdef RPC_DEBUG
1638   - if (!sunrpc_table_header) {
  1638 + if (!sunrpc_table_header)
1639 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 1640 #endif
1646 1641  
1647 1642 return 0;