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

nfsd: rq_lease_breaker cleanup 



Since only the v4 code cares about it, maybe it's better to leave
rq_lease_breaker out of the common dispatch code?

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

fs/nfsd/nfs4state.c

+2 −1
Original line number Diff line number Diff line
@@ -4598,7 +4598,8 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl) 
	if (!i_am_nfsd())

		return NULL;

	rqst = kthread_data(current);

	if (!rqst->rq_lease_breaker)

	/* Note rq_prog == NFS_ACL_PROGRAM is also possible: */

	if (rqst->rq_prog != NFS_PROGRAM || rqst->rq_vers < 4)

		return NULL;

	clp = *(rqst->rq_lease_breaker);

	return dl->dl_stid.sc_client == clp;

fs/nfsd/nfssvc.c

+0 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) 
		*statp = rpc_garbage_args;

		return 1;

	}

	rqstp->rq_lease_breaker = NULL;

	/*

	 * Give the xdr decoder a chance to change this if it wants

	 * (necessary in the NFSv4.0 compound case)