diff options
author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2011-10-25 07:17:48 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-10-25 07:20:50 -0400 |
commit | e20de377578e9504f8467c05ab1db98b4935d4ed (patch) | |
tree | feb55510ccc12c1a2f830f47c64d1bf5ba57d720 /net | |
parent | 0f0c01da444fbfd63556f301dde15915fd6cbb20 (diff) |
SUNRPC: remove rpcbind clients destruction on module cleanup
Rpcbind clients destruction during SUNRPC module removing is obsolete since now
those clients are destroying during last RPC service shutdown.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/rpcb_clnt.c | 12 | ||||
-rw-r--r-- | net/sunrpc/sunrpc_syms.c | 3 |
2 files changed, 0 insertions, 15 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index e913039133a9..8761bf8e36fc 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c | |||
@@ -1100,15 +1100,3 @@ static struct rpc_program rpcb_program = { | |||
1100 | .version = rpcb_version, | 1100 | .version = rpcb_version, |
1101 | .stats = &rpcb_stats, | 1101 | .stats = &rpcb_stats, |
1102 | }; | 1102 | }; |
1103 | |||
1104 | /** | ||
1105 | * cleanup_rpcb_clnt - remove xprtsock's sysctls, unregister | ||
1106 | * | ||
1107 | */ | ||
1108 | void cleanup_rpcb_clnt(void) | ||
1109 | { | ||
1110 | if (rpcb_local_clnt4) | ||
1111 | rpc_shutdown_client(rpcb_local_clnt4); | ||
1112 | if (rpcb_local_clnt) | ||
1113 | rpc_shutdown_client(rpcb_local_clnt); | ||
1114 | } | ||
diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c index 9d0809160994..8ec9778c3f4a 100644 --- a/net/sunrpc/sunrpc_syms.c +++ b/net/sunrpc/sunrpc_syms.c | |||
@@ -61,8 +61,6 @@ static struct pernet_operations sunrpc_net_ops = { | |||
61 | 61 | ||
62 | extern struct cache_detail unix_gid_cache; | 62 | extern struct cache_detail unix_gid_cache; |
63 | 63 | ||
64 | extern void cleanup_rpcb_clnt(void); | ||
65 | |||
66 | static int __init | 64 | static int __init |
67 | init_sunrpc(void) | 65 | init_sunrpc(void) |
68 | { | 66 | { |
@@ -102,7 +100,6 @@ out: | |||
102 | static void __exit | 100 | static void __exit |
103 | cleanup_sunrpc(void) | 101 | cleanup_sunrpc(void) |
104 | { | 102 | { |
105 | cleanup_rpcb_clnt(); | ||
106 | rpcauth_remove_module(); | 103 | rpcauth_remove_module(); |
107 | cleanup_socket_xprt(); | 104 | cleanup_socket_xprt(); |
108 | svc_cleanup_xprt_sock(); | 105 | svc_cleanup_xprt_sock(); |