diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-10-19 11:42:03 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-10-19 11:42:03 -0400 |
| commit | a8d86cd75b709a9c9402c46674ea188493c53901 (patch) | |
| tree | 54db34075031aff286004d5c8161731ef59f7b28 /fs/nfsd | |
| parent | 856121b2e83bd64bffdc8de449d24c9295e92ff3 (diff) | |
| download | linux-a8d86cd75b709a9c9402c46674ea188493c53901.tar.gz linux-a8d86cd75b709a9c9402c46674ea188493c53901.tar.bz2 linux-a8d86cd75b709a9c9402c46674ea188493c53901.zip | |
nfsd4: remove unneeded CLAIM_DELEGATE_CUR workaround
0c12eaffdf09466f36a9ffe970dda8f4aeb6efc0 "nfsd: don't break lease on
CLAIM_DELEGATE_CUR" was a temporary workaround for a problem fixed
properly in the vfs layer by 778fc546f749c588aa2f6cd50215d2715c374252
"locks: fix tracking of inprogress lease breaks", so we can revert that
change (but keeping some minor cleanup from that commit).
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3e1d4e08dfad..15e0db140403 100644 --- a/fs/nfsd/nfs4state.c +++ b/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]); |