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

nfsd: lock state around put client and delegation in nfsd4_cb_recall 

not having the state locked before putting the client/delegation causes a bug.
Also removed the comment from the function header about the state being already locked

Signed-off-by: Alexandros Batsakis <batsakis@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Alexandros Batsakis 2008-12-18 19:55:16 -08:00 committed by J. Bruce Fields
parent 6c02eaa1d1
commit e37da04ed1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfsd/nfs4callback.c
View File

@ -451,7 +451,6 @@ nfsd4_probe_callback(struct nfs4_client *clp)
/* /*
* called with dp->dl_count inc'ed. * called with dp->dl_count inc'ed.
* nfs4_lock_state() may or may not have been called.
*/ */
void void
nfsd4_cb_recall(struct nfs4_delegation *dp) nfsd4_cb_recall(struct nfs4_delegation *dp)
@ -491,7 +490,9 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
* Success or failure, now we're either waiting for lease expiration * Success or failure, now we're either waiting for lease expiration
* or deleg_return. * or deleg_return.
*/ */
nfs4_lock_state();
put_nfs4_client(clp); put_nfs4_client(clp);
nfs4_put_delegation(dp); nfs4_put_delegation(dp);
nfs4_unlock_state();
return; return;
} }