path: root/fs/nfs
diff options
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-08-24 14:46:48 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-05 16:28:37 -0700
commitb6f70b7027f157fbba45091518f34faf40ad81b8 (patch)
tree57bb5ceca36c56067396e5c215fea73fca8f7e8c /fs/nfs
parentc73df6f73c8167b9ed68d653d1a5c761c209d2b5 (diff)
NFSv3: Fix another acl regression
commit f87d928f6d98644d39809a013a22f981d39017cf upstream. When creating a new object on the NFS server, we should not be sending posix setacl requests unless the preceding posix_acl_create returned a non-trivial acl. Doing so, causes Solaris servers in particular to return an EINVAL. Fixes: 013cdf1088d72 (nfs: use generic posix ACL infrastructure,,,) Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1132786 Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs')
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
index 4a1aafba6a20..8c34f57a9aef 100644
--- a/fs/nfs/nfs3acl.c
+++ b/fs/nfs/nfs3acl.c
@@ -305,7 +305,10 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,
.rpc_argp = &args,
.rpc_resp = &fattr,
- int status;
+ int status = 0;
+ if (acl == NULL && (!S_ISDIR(inode->i_mode) || dfacl == NULL))
+ goto out;
status = -EOPNOTSUPP;
if (!nfs_server_capable(inode, NFS_CAP_ACLS))