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

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

nfsd: remove some unnecessary dropit handling 



We no longer need a few of these special cases.

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

fs/nfsd/nfs4proc.c

+0 −4
Original line number Diff line number Diff line
@@ -1156,10 +1156,6 @@ encode_op: 


		nfsd4_increment_op_stats(op->opnum);

	}

	if (!rqstp->rq_usedeferral && status == nfserr_dropit) {

		dprintk("%s Dropit - send NFS4ERR_DELAY\n", __func__);

		status = nfserr_jukebox;

	}



	resp->cstate.status = status;

	fh_put(&resp->cstate.current_fh);

fs/nfsd/nfs4state.c

+0 −2
Original line number Diff line number Diff line
@@ -2509,8 +2509,6 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file 
	if (!fp->fi_fds[oflag]) {

		status = nfsd_open(rqstp, cur_fh, S_IFREG, access,

			&fp->fi_fds[oflag]);

		if (status == nfserr_dropit)

			status = nfserr_jukebox;

		if (status)

			return status;

	}

fs/nfsd/nfs4xdr.c

+0 −2
Original line number Diff line number Diff line
@@ -2328,8 +2328,6 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, 
	case nfserr_resource:

		nfserr = nfserr_toosmall;

		goto fail;

	case nfserr_dropit:

		goto fail;

	case nfserr_noent:

		goto skip_entry;

	default:

fs/nfsd/vfs.c

+0 −4
Original line number Diff line number Diff line
@@ -380,8 +380,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, 
		 * we need to break all leases.

		 */

		host_err = break_lease(inode, O_WRONLY | O_NONBLOCK);

		if (host_err == -EWOULDBLOCK)

			host_err = -ETIMEDOUT;

		if (host_err) /* ENOMEM or EWOULDBLOCK */

			goto out_nfserr;
@@ -752,8 +750,6 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, 
	 */

	if (!(access & NFSD_MAY_NOT_BREAK_LEASE))

		host_err = break_lease(inode, O_NONBLOCK | ((access & NFSD_MAY_WRITE) ? O_WRONLY : 0));

	if (host_err == -EWOULDBLOCK)

		host_err = -ETIMEDOUT;

	if (host_err) /* NOMEM or WOULDBLOCK */

		goto out_nfserr;