diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-06-07 23:30:45 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-06-20 14:59:43 +0200 |
| commit | 4af825041b06c2ef9b5933288267a11e029eb360 (patch) | |
| tree | 508bfc564e44e62586a81c8aeb34d6f9ac249072 /fs | |
| parent | nfsd4: nfsd4_lock() cleanup (diff) | |
| download | linux-4af825041b06c2ef9b5933288267a11e029eb360.tar.xz linux-4af825041b06c2ef9b5933288267a11e029eb360.zip | |
nfsd4: process_open2 cleanup
Note we can simplify the error handling a little by doing the truncate
earlier.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index de8f7e45102d..9efa4055b5a8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3013,14 +3013,12 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf status = nfs4_get_vfs_file(rqstp, fp, current_fh, open); if (status) goto out; + status = nfsd4_truncate(rqstp, current_fh, open); + if (status) + goto out; stp = open->op_stp; open->op_stp = NULL; init_open_stateid(stp, fp, open); - status = nfsd4_truncate(rqstp, current_fh, open); - if (status) { - release_open_stateid(stp); - goto out; - } } update_stateid(&stp->st_stid.sc_stateid); memcpy(&open->op_stateid, &stp->st_stid.sc_stateid, sizeof(stateid_t)); |