hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nfsd4: eliminate unused lt_stateowner 

This is used only as a local variable.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2011-09-01 11:31:45 -04:00
parent 7c13f344cf
commit 16d259418b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfsd/nfs4state.c
View File

@ -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;

1
fs/nfsd/xdr4.h
View File

@ -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;
}; };