From 557b94a1a4a8e7f15ef6f605e958a3fe5e9fa957 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 10 Apr 2006 22:55:39 -0700
Subject: [PATCH] --- yaml --- r: 25589 b: refs/heads/master c:
 4e2fd495b520b51e4ba83340f13520b7f07e3743 h: refs/heads/master i:   25587:
 e63be1fe3a2e86efbee60b506224cf26f80f1abd v: v3

---
 [refs]                    |  2 +-
 trunk/fs/nfsd/nfs4state.c | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 969909b75ae8..c993d5023122 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 541e0e09814594e907e18fb8d9fc9b746aa4b18a
+refs/heads/master: 4e2fd495b520b51e4ba83340f13520b7f07e3743
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 01ff544dc1f5..e97c58aafde5 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -329,23 +329,30 @@ put_nfs4_client(struct nfs4_client *clp)
 		free_client(clp);
 }
 
+static void
+shutdown_callback_client(struct nfs4_client *clp)
+{
+	struct rpc_clnt *clnt = clp->cl_callback.cb_client;
+
+	/* shutdown rpc client, ending any outstanding recall rpcs */
+	if (clnt) {
+		clp->cl_callback.cb_client = NULL;
+		rpc_shutdown_client(clnt);
+		rpciod_down();
+	}
+}
+
 static void
 expire_client(struct nfs4_client *clp)
 {
 	struct nfs4_stateowner *sop;
 	struct nfs4_delegation *dp;
-	struct nfs4_callback *cb = &clp->cl_callback;
-	struct rpc_clnt *clnt = clp->cl_callback.cb_client;
 	struct list_head reaplist;
 
 	dprintk("NFSD: expire_client cl_count %d\n",
 	                    atomic_read(&clp->cl_count));
 
-	/* shutdown rpc client, ending any outstanding recall rpcs */
-	if (atomic_read(&cb->cb_set) == 1 && clnt) {
-		rpc_shutdown_client(clnt);
-		clnt = clp->cl_callback.cb_client = NULL;
-	}
+	shutdown_callback_client(clp);
 
 	INIT_LIST_HEAD(&reaplist);
 	spin_lock(&recall_lock);