diff --git a/[refs] b/[refs]
index 918c2371ee7a..79f4722193ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c02eaa1d1e53b9b2cc27d0c6fff3e57da4b611f
+refs/heads/master: e37da04ed145d45c2a698d7cb373a7e1191fbe86
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index c6804db33c17..3ddc9fb2e358 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/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 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
 	 * 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;
 }