Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f34f9242 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

[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: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a4db5fe5

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

fs/nfsd/vfs.c

+4 −1
Original line number Diff line number Diff line
@@ -466,6 +466,9 @@ out: 
	posix_acl_release(dpacl);

	return (error);

out_nfserr:

	if (host_error == -EOPNOTSUPP)

		error = nfserr_attrnotsupp;

	else

		error = nfserrno(host_error);

	goto out;

}