diff options
author | fanchaoting <fanchaoting@cn.fujitsu.com> | 2013-04-01 15:07:22 +0200 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2013-04-03 21:19:06 +0200 |
commit | b022032e195ffca83d7002d6b84297d796ed443b (patch) | |
tree | ecbcc134db21887d908ec979c393d724dce52407 /fs/nfsd | |
parent | nfsd: convert the file_hashtbl to a hlist (diff) | |
download | linux-b022032e195ffca83d7002d6b84297d796ed443b.tar.xz linux-b022032e195ffca83d7002d6b84297d796ed443b.zip |
nfsd: don't run get_file if nfs4_preprocess_stateid_op return error
we should return error status directly when nfs4_preprocess_stateid_op
return error.
Signed-off-by: fanchaoting <fanchaoting@cn.fujitsu.com>
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 42c498ce9f0e..a9b707b23858 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -953,14 +953,14 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, nfs4_lock_state(); status = nfs4_preprocess_stateid_op(SVC_NET(rqstp), cstate, stateid, WR_STATE, &filp); - if (filp) - get_file(filp); - nfs4_unlock_state(); - if (status) { + nfs4_unlock_state(); dprintk("NFSD: nfsd4_write: couldn't process stateid!\n"); return status; } + if (filp) + get_file(filp); + nfs4_unlock_state(); cnt = write->wr_buflen; write->wr_how_written = write->wr_stable_how; |