diff options
| author | J. Bruce Fields | 2007-02-16 10:28:34 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-02-16 17:14:01 +0100 |
| commit | f34f924274ad8f84c6d86ea9e52b0682347f5701 (patch) | |
| tree | 415bebb9cc9ca17f30bacc126d8e62fb0dc0d984 /fs/nfsd | |
| parent | [PATCH] knfsd: nfsd4: fix memory leak on kmalloc failure in savemem (diff) | |
| download | kernel-qcow2-linux-f34f924274ad8f84c6d86ea9e52b0682347f5701.tar.gz kernel-qcow2-linux-f34f924274ad8f84c6d86ea9e52b0682347f5701.tar.xz kernel-qcow2-linux-f34f924274ad8f84c6d86ea9e52b0682347f5701.zip | |
[PATCH] knfsd: nfsd4: fix error return on unsupported acl
We should be returning ATTRNOTSUPP, not NOTSUPP, when acls are unsupported.
Also fix a comment.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/vfs.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index bb0f1860f582..5d090f11f2be 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -253,7 +253,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia return status; /* - * According to spec, unsupported attributes return ERR_NOTSUPP; + * According to spec, unsupported attributes return ERR_ATTRNOTSUPP; * read-only attributes return ERR_INVAL. */ if ((bmval[0] & ~NFSD_SUPPORTED_ATTRS_WORD0) || (bmval[1] & ~NFSD_SUPPORTED_ATTRS_WORD1)) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 8283236c6a0f..7e6aa245b5d5 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -466,7 +466,10 @@ out: posix_acl_release(dpacl); return (error); out_nfserr: - error = nfserrno(host_error); + if (host_error == -EOPNOTSUPP) + error = nfserr_attrnotsupp; + else + error = nfserrno(host_error); goto out; } |