From 81d60573be491f81dc87a472af2e6523b0ed694b Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Wed, 19 Oct 2011 11:42:03 -0400 Subject: [PATCH] --- yaml --- r: 267197 b: refs/heads/master c: a8d86cd75b709a9c9402c46674ea188493c53901 h: refs/heads/master i: 267195: bec82827b51ba3da31578df6ad7bfa319e4f0130 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 108ab3ba525e..a709387f1423 100644 --- 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 index 3e1d4e08dfad..15e0db140403 100644 --- 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]);