---

yaml --- r: 267179 b: refs/heads/master c: 71c3bcd h: refs/heads/master i: 267177: a731e29 267175: 4fd3bf1 v: v3
git-mirror · Oct 10, 2011 · 3d4d3e7 · 3d4d3e7
1 parent 45246a2
commit 3d4d3e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38c2f4b12a455cb3a108fd5c79a10df2ba3ec9a7
+refs/heads/master: 71c3bcd71393a9e67d5b77597a612537f89c30ed
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
@@ -4185,7 +4185,8 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 	memcpy(&locku->lu_stateid, &stp->st_stid.sc_stateid, sizeof(stateid_t));
 
 out:
-	nfs4_unlock_state();
+	if (!cstate->replay_owner)
+		nfs4_unlock_state();
 	return status;
 
 out_nfserr: