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

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

nfsd4: eliminate unused lt_stateowner 



This is used only as a local variable.

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

fs/nfsd/nfs4state.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -4098,6 +4098,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
{

{

	struct inode *inode;

	struct inode *inode;

	struct file_lock file_lock;

	struct file_lock file_lock;

	struct nfs4_stateowner *so;

	int error;

	int error;

	__be32 status;

	__be32 status;
@@ -4107,7 +4108,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (check_lock_length(lockt->lt_offset, lockt->lt_length))

	if (check_lock_length(lockt->lt_offset, lockt->lt_length))

		 return nfserr_inval;

		 return nfserr_inval;





	lockt->lt_stateowner = NULL;

	nfs4_lock_state();

	nfs4_lock_state();





	status = nfserr_stale_clientid;

	status = nfserr_stale_clientid;
@@ -4134,10 +4134,10 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		goto out;

		goto out;

	}

	}





	lockt->lt_stateowner = find_lockstateowner_str(inode,

	so = find_lockstateowner_str(inode,

			&lockt->lt_clientid, &lockt->lt_owner);

			&lockt->lt_clientid, &lockt->lt_owner);

	if (lockt->lt_stateowner)

	if (so)

		file_lock.fl_owner = (fl_owner_t)lockt->lt_stateowner;

		file_lock.fl_owner = (fl_owner_t)so;

	file_lock.fl_pid = current->tgid;

	file_lock.fl_pid = current->tgid;

	file_lock.fl_flags = FL_POSIX;

	file_lock.fl_flags = FL_POSIX;

fs/nfsd/xdr4.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,6 @@ struct nfsd4_lockt { 
	struct xdr_netobj		lt_owner;

	struct xdr_netobj		lt_owner;

	u64				lt_offset;

	u64				lt_offset;

	u64				lt_length;

	u64				lt_length;

	struct nfs4_stateowner * 	lt_stateowner;

	struct nfsd4_lock_denied  	lt_denied;

	struct nfsd4_lock_denied  	lt_denied;

};

};