git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd: fix b0rken error value for setattr on read-only mount
[pandora-kernel.git]
/
fs
/
nfsd
/
nfs4proc.c
diff --git
a/fs/nfsd/nfs4proc.c
b/fs/nfsd/nfs4proc.c
index
2ed14df
..
694d526
100644
(file)
--- a/
fs/nfsd/nfs4proc.c
+++ b/
fs/nfsd/nfs4proc.c
@@
-841,6
+841,7
@@
nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_setattr *setattr)
{
__be32 status = nfs_ok;
struct nfsd4_setattr *setattr)
{
__be32 status = nfs_ok;
+ int err;
if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
nfs4_lock_state();
if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
nfs4_lock_state();
@@
-852,9
+853,9
@@
nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
return status;
}
}
return status;
}
}
-
status
= fh_want_write(&cstate->current_fh);
- if (
status
)
- return
status
;
+
err
= fh_want_write(&cstate->current_fh);
+ if (
err
)
+ return
nfserrno(err)
;
status = nfs_ok;
status = check_attr_support(rqstp, cstate, setattr->sa_bmval,
status = nfs_ok;
status = check_attr_support(rqstp, cstate, setattr->sa_bmval,