diff options
-rw-r--r-- | fs/nfsd/nfs4state.c | 7 |
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 | |||
2056 | { | 2056 | { |
2057 | struct nfs4_stateid *stp = NULL; | 2057 | struct nfs4_stateid *stp = NULL; |
2058 | struct nfs4_delegation *dp = NULL; | 2058 | struct nfs4_delegation *dp = NULL; |
2059 | stateid_t *stidp; | ||
2060 | struct inode *ino = current_fh->fh_dentry->d_inode; | 2059 | struct inode *ino = current_fh->fh_dentry->d_inode; |
2061 | __be32 status; | 2060 | __be32 status; |
2062 | 2061 | ||
@@ -2083,8 +2082,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl | |||
2083 | dprintk("NFSD: delegation stateid not found\n"); | 2082 | dprintk("NFSD: delegation stateid not found\n"); |
2084 | goto out; | 2083 | goto out; |
2085 | } | 2084 | } |
2086 | stidp = &dp->dl_stateid; | 2085 | status = check_stateid_generation(stateid, &dp->dl_stateid); |
2087 | status = check_stateid_generation(stateid, stidp); | ||
2088 | if (status) | 2086 | if (status) |
2089 | goto out; | 2087 | goto out; |
2090 | status = nfs4_check_delegmode(dp, flags); | 2088 | status = nfs4_check_delegmode(dp, flags); |
@@ -2105,8 +2103,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl | |||
2105 | goto out; | 2103 | goto out; |
2106 | if (!stp->st_stateowner->so_confirmed) | 2104 | if (!stp->st_stateowner->so_confirmed) |
2107 | goto out; | 2105 | goto out; |
2108 | stidp = &stp->st_stateid; | 2106 | status = check_stateid_generation(stateid, &stp->st_stateid); |
2109 | status = check_stateid_generation(stateid, stidp); | ||
2110 | if (status) | 2107 | if (status) |
2111 | goto out; | 2108 | goto out; |
2112 | status = nfs4_check_openmode(stp, flags); | 2109 | status = nfs4_check_openmode(stp, flags); |