Selaa lähdekoodia

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>
Alexandros Batsakis 16 vuotta sitten
vanhempi
commit
e37da04ed1
1 muutettua tiedostoa jossa 2 lisäystä ja 1 poistoa
  1. 2 1
      fs/nfsd/nfs4callback.c

+ 2 - 1
fs/nfsd/nfs4callback.c

@@ -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 @@ out_put_cred:
 	 * 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;
 }
 }