From 72ac956508b238e0b1d455477ae4d1db7518db01 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Tue, 25 Oct 2011 14:17:48 +0300
Subject: [PATCH] --- yaml --- r: 273759 b: refs/heads/master c:
 e20de377578e9504f8467c05ab1db98b4935d4ed h: refs/heads/master i:   273757:
 8aed8322b3662bf231ea5b16ac6250387e127866   273755:
 c3e210563c884852f1179536efeeeaeed3ff04eb   273751:
 d2741e69b9a189bf9aa849048c019010b44b11ff   273743:
 013824e8043fe842349746f3203c6c97da92b660   273727:
 e0e142390d3c0cd69e6fd6d26ded3dfb2a5da22c v: v3

---
 [refs]                         |  2 +-
 trunk/net/sunrpc/rpcb_clnt.c   | 12 ------------
 trunk/net/sunrpc/sunrpc_syms.c |  3 ---
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 300cd4cb19ae..2f41087621fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f0c01da444fbfd63556f301dde15915fd6cbb20
+refs/heads/master: e20de377578e9504f8467c05ab1db98b4935d4ed
diff --git a/trunk/net/sunrpc/rpcb_clnt.c b/trunk/net/sunrpc/rpcb_clnt.c
index e913039133a9..8761bf8e36fc 100644
--- a/trunk/net/sunrpc/rpcb_clnt.c
+++ b/trunk/net/sunrpc/rpcb_clnt.c
@@ -1100,15 +1100,3 @@ static struct rpc_program rpcb_program = {
 	.version	= rpcb_version,
 	.stats		= &rpcb_stats,
 };
-
-/**
- * cleanup_rpcb_clnt - remove xprtsock's sysctls, unregister
- *
- */
-void cleanup_rpcb_clnt(void)
-{
-	if (rpcb_local_clnt4)
-		rpc_shutdown_client(rpcb_local_clnt4);
-	if (rpcb_local_clnt)
-		rpc_shutdown_client(rpcb_local_clnt);
-}
diff --git a/trunk/net/sunrpc/sunrpc_syms.c b/trunk/net/sunrpc/sunrpc_syms.c
index 9d0809160994..8ec9778c3f4a 100644
--- a/trunk/net/sunrpc/sunrpc_syms.c
+++ b/trunk/net/sunrpc/sunrpc_syms.c
@@ -61,8 +61,6 @@ static struct pernet_operations sunrpc_net_ops = {
 
 extern struct cache_detail unix_gid_cache;
 
-extern void cleanup_rpcb_clnt(void);
-
 static int __init
 init_sunrpc(void)
 {
@@ -102,7 +100,6 @@ init_sunrpc(void)
 static void __exit
 cleanup_sunrpc(void)
 {
-	cleanup_rpcb_clnt();
 	rpcauth_remove_module();
 	cleanup_socket_xprt();
 	svc_cleanup_xprt_sock();