projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89876f8
)
nfsd: don't run get_file if nfs4_preprocess_stateid_op return error
author
fanchaoting
<
[email protected]
>
Mon, 1 Apr 2013 13:07:22 +0000
(21:07 +0800)
committer
J. Bruce Fields
<
[email protected]
>
Wed, 3 Apr 2013 19:19:06 +0000
(15:19 -0400)
we should return error status directly when nfs4_preprocess_stateid_op
return error.
Signed-off-by: fanchaoting <
[email protected]
>
Cc:
[email protected]
Signed-off-by: J. Bruce Fields <
[email protected]
>
fs/nfsd/nfs4proc.c
patch
|
blob
|
history
diff --git
a/fs/nfsd/nfs4proc.c
b/fs/nfsd/nfs4proc.c
index 42c498ce9f0e12d8faec855a4e927dcc8b04d6a5..a9b707b23858cc195a17e22f9f2a00febad45ae1 100644
(file)
--- 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;