diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-27 17:42:43 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 08:56:35 -0700 |
| commit | d2fd339e9fa7343f521e72add938fd1120f3f8d9 (patch) | |
| tree | c89aad7b83b9c1177b0c20be2bda91afe868ee81 | |
| parent | dbe7f938e41ed62242b4dfc1fc77f918646fad5c (diff) | |
| download | linux-stable-d2fd339e9fa7343f521e72add938fd1120f3f8d9.tar.gz linux-stable-d2fd339e9fa7343f521e72add938fd1120f3f8d9.tar.bz2 linux-stable-d2fd339e9fa7343f521e72add938fd1120f3f8d9.zip | |
nfsd: fix b0rken error value for setattr on read-only mount
commit 96f6f98501196d46ce52c2697dd758d9300c63f5 upstream.
..._want_write() returns -EROFS on failure, _not_ an NFS error value.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 0b8830c9de73..d06a02c1b1a3 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -812,6 +812,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_setattr *setattr) { __be32 status = nfs_ok; + int err; if (setattr->sa_iattr.ia_valid & ATTR_SIZE) { nfs4_lock_state(); @@ -823,9 +824,9 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return status; } } - status = mnt_want_write(cstate->current_fh.fh_export->ex_path.mnt); - if (status) - return status; + err = mnt_want_write(cstate->current_fh.fh_export->ex_path.mnt); + if (err) + return nfserrno(err); status = nfs_ok; status = check_attr_support(rqstp, cstate, setattr->sa_bmval, |