Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8d86cd7 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: remove unneeded CLAIM_DELEGATE_CUR workaround 



0c12eaff "nfsd: don't break lease on
CLAIM_DELEGATE_CUR" was a temporary workaround for a problem fixed
properly in the vfs layer by 778fc546
"locks: fix tracking of inprogress lease breaks", so we can revert that
change (but keeping some minor cleanup from that commit).

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 856121b2

fs/nfsd/nfs4state.c

+0 −6
Original line number Diff line number Diff line
@@ -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]);