nfsd: fix b0rken error value for setattr on read-only mount
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 13 Apr 2012 03:47:00 +0000 (23:47 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 13 Apr 2012 14:12:00 +0000 (10:12 -0400)
..._want_write() returns -EROFS on failure, _not_ an NFS error value.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/nfsd/nfs4proc.c

index 2ed14dfd00a231e9c813b78b3d728bcdfb849b06..694d526c8f19e6cfa56d628d6649a5bbe37ce6e9 100644 (file)
@@ -841,6 +841,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();
@@ -852,9 +853,9 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                        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,