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>

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index c6804db33c1708b61e3e93560548326b7faa87ff..3ddc9fb2e358c15de1d31a9336089f6d7dddb153 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -451,7 +451,6 @@ nfsd4_probe_callback(struct nfs4_client *clp)
 
 /*
  * called with dp->dl_count inc'ed.
- * nfs4_lock_state() may or may not have been called.
  */
 void
 nfsd4_cb_recall(struct nfs4_delegation *dp)
@@ -491,7 +490,9 @@ out_put_cred:
         * Success or failure, now we're either waiting for lease expiration
         * or deleg_return.
         */
+       nfs4_lock_state();
        put_nfs4_client(clp);
        nfs4_put_delegation(dp);
+       nfs4_unlock_state();
        return;
 }