---

yaml --- r: 192383 b: refs/heads/master c: ab707e1 h: refs/heads/master i: 192381: c6bba65 192379: 9609a90 192375: 351b785 192367: 457f6f1 192351: d85f424 192319: 591f43e 192255: 9546a77 v: v3
git-mirror · May 13, 2010 · 3f1a100 · 3f1a100
1 parent 3bc79e2
commit 3f1a100
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d76829889ac4250a18cfcc1a606bb256bb9c570c
+refs/heads/master: ab707e156593ff7fffd615757332dbff6616836a
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
@@ -718,6 +718,7 @@ void nfsd4_destroy_callback_queue(void)
 	destroy_workqueue(callback_wq);
 }
 
+/* must be called under the state lock */
 void nfsd4_set_callback_client(struct nfs4_client *clp, struct rpc_clnt *new)
 {
 	struct rpc_clnt *old = clp->cl_cb_client;

diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
@@ -1427,8 +1427,10 @@ nfsd4_destroy_session(struct svc_rqst *r,
 	unhash_session(ses);
 	spin_unlock(&client_lock);
 
+	nfs4_lock_state();
 	/* wait for callbacks */
 	nfsd4_set_callback_client(ses->se_client, NULL);
+	nfs4_unlock_state();
 	nfsd4_put_session(ses);
 	status = nfs_ok;
 out: