summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-02-21 20:27:30 +0100
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-03-18 22:30:52 +0100
commitfd03b09906c32aea7b47f1275c9cd6034141159d (patch)
tree636b8061f70333e5a3ccf456d6f9101c0bc81eea /fs/nfsd/nfs4state.c
parentnfsd4: remove redundant "if" in nfs4_preprocess_stateid_op (diff)
downloadlinux-fd03b09906c32aea7b47f1275c9cd6034141159d.tar.xz
linux-fd03b09906c32aea7b47f1275c9cd6034141159d.zip
nfsd4: remove unneeded local variable
We no longer need stidp. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r--fs/nfsd/nfs4state.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 16fcb656f47f..099938ebc9d3 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2056,7 +2056,6 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
{
struct nfs4_stateid *stp = NULL;
struct nfs4_delegation *dp = NULL;
- stateid_t *stidp;
struct inode *ino = current_fh->fh_dentry->d_inode;
__be32 status;
@@ -2083,8 +2082,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
dprintk("NFSD: delegation stateid not found\n");
goto out;
}
- stidp = &dp->dl_stateid;
- status = check_stateid_generation(stateid, stidp);
+ status = check_stateid_generation(stateid, &dp->dl_stateid);
if (status)
goto out;
status = nfs4_check_delegmode(dp, flags);
@@ -2105,8 +2103,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
goto out;
if (!stp->st_stateowner->so_confirmed)
goto out;
- stidp = &stp->st_stateid;
- status = check_stateid_generation(stateid, stidp);
+ status = check_stateid_generation(stateid, &stp->st_stateid);
if (status)
goto out;
status = nfs4_check_openmode(stp, flags);