UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
J. Bruce Fields 2007-02-16 01:28:34 -08:00 committed by Linus Torvalds
parent a4db5fe5df
commit f34f924274
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/nfs4xdr.c
View File

@ -253,7 +253,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia
return status; return status;
/* /*
* According to spec, unsupported attributes return ERR_NOTSUPP; * According to spec, unsupported attributes return ERR_ATTRNOTSUPP;
* read-only attributes return ERR_INVAL. * read-only attributes return ERR_INVAL.
*/ */
if ((bmval[0] & ~NFSD_SUPPORTED_ATTRS_WORD0) || (bmval[1] & ~NFSD_SUPPORTED_ATTRS_WORD1)) if ((bmval[0] & ~NFSD_SUPPORTED_ATTRS_WORD0) || (bmval[1] & ~NFSD_SUPPORTED_ATTRS_WORD1))

5
fs/nfsd/vfs.c
View File

@ -466,7 +466,10 @@ out:
posix_acl_release(dpacl); posix_acl_release(dpacl);
return (error); return (error);
out_nfserr: out_nfserr:
error = nfserrno(host_error); if (host_error == -EOPNOTSUPP)
error = nfserr_attrnotsupp;
else
error = nfserrno(host_error);
goto out; goto out;
} }