---

yaml --- r: 267197 b: refs/heads/master c: a8d86cd h: refs/heads/master i: 267195: bec8282 v: v3
git-mirror · Oct 19, 2011 · 81d6057 · 81d6057
1 parent bfbf533
commit 81d6057
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 856121b2e83bd64bffdc8de449d24c9295e92ff3
+refs/heads/master: a8d86cd75b709a9c9402c46674ea188493c53901
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
@@ -2653,12 +2653,6 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp,
 	int oflag = nfs4_access_to_omode(open->op_share_access);
 	int access = nfs4_access_to_access(open->op_share_access);
 
-	/* CLAIM_DELEGATE_CUR is used in response to a broken lease;
-	 * allowing it to break the lease and return EAGAIN leaves the
-	 * client unable to make progress in returning the delegation */
-	if (open->op_claim_type == NFS4_OPEN_CLAIM_DELEGATE_CUR)
-		access |= NFSD_MAY_NOT_BREAK_LEASE;
-
 	if (!fp->fi_fds[oflag]) {
 		status = nfsd_open(rqstp, cur_fh, S_IFREG, access,
 			&fp->fi_fds[oflag]);