From 39ef302ea0bbaa0e8b8a24e2fc12fc22dc3d10d2 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Fri, 16 Feb 2007 01:28:34 -0800 Subject: [PATCH] --- yaml --- r: 48617 b: refs/heads/master c: f34f924274ad8f84c6d86ea9e52b0682347f5701 h: refs/heads/master i: 48615: 98501a1769183696802a9adcf040a2494713a52a v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4xdr.c | 2 +- trunk/fs/nfsd/vfs.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7faf3d6acfe8..1f59e843c2de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4db5fe5dfb3a5b5b550f1acd95ef3de01a3f063 +refs/heads/master: f34f924274ad8f84c6d86ea9e52b0682347f5701 diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c index bb0f1860f582..5d090f11f2be 100644 --- a/trunk/fs/nfsd/nfs4xdr.c +++ b/trunk/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/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c index 8283236c6a0f..7e6aa245b5d5 100644 --- a/trunk/fs/nfsd/vfs.c +++ b/trunk/fs/nfsd/vfs.c @@ -466,7 +466,10 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp, 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; }