openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd4: nfsd4_destroy_session must set callback client under the state lock 

nfsd4_set_callback_client must be called under the state lock to atomically
set or unset the callback client and shutting down the previous one.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Benny Halevy 2010-05-12 00:14:06 +03:00 committed by J. Bruce Fields
parent d76829889a
commit ab707e1565
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/nfsd/nfs4callback.c
View File

@ -718,6 +718,7 @@ void nfsd4_destroy_callback_queue(void)
destroy_workqueue(callback_wq); destroy_workqueue(callback_wq);
} }
/* must be called under the state lock */
void nfsd4_set_callback_client(struct nfs4_client *clp, struct rpc_clnt *new) void nfsd4_set_callback_client(struct nfs4_client *clp, struct rpc_clnt *new)
{ {
struct rpc_clnt *old = clp->cl_cb_client; struct rpc_clnt *old = clp->cl_cb_client;

2
fs/nfsd/nfs4state.c
View File

@ -1427,8 +1427,10 @@ nfsd4_destroy_session(struct svc_rqst *r,
unhash_session(ses); unhash_session(ses);
spin_unlock(&client_lock); spin_unlock(&client_lock);
nfs4_lock_state();
/* wait for callbacks */ /* wait for callbacks */
nfsd4_set_callback_client(ses->se_client, NULL); nfsd4_set_callback_client(ses->se_client, NULL);
nfs4_unlock_state();
nfsd4_put_session(ses); nfsd4_put_session(ses);
status = nfs_ok; status = nfs_ok;
out: out: