summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-02-27 23:47:26 +0100
committerNiels de Vos <ndevos@redhat.com>2015-03-08 21:31:31 -0700
commitf7f446f0a5bc37ba1096604618ab9850341959ef (patch)
treeafab4ed5aa5466aea5e77caff25154cc10fa9803
parent9b3c799fa3a5535e189d18200324d912339ac6a6 (diff)
nfs: prevent logging missing 'system.posix_acl_access' xattrs
Change http://review.gluster.org/9773 addresses the majority of the logging, but it seems it is still possible to trigger the excessive logging by requesting the ACL on files directly. Lets squash those too. BUG: 1197253 Change-Id: I9e90ddd45f1a39641478f34c69c64dfe1c11c727 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/9781 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Meghana M <mmadhusu@redhat.com>
-rw-r--r--xlators/nfs/server/src/acl3.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c
index 39eee0b265e..fa10c873eb8 100644
--- a/xlators/nfs/server/src/acl3.c
+++ b/xlators/nfs/server/src/acl3.c
@@ -271,6 +271,10 @@ acl3_getacl_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
if ((op_ret < 0) && (op_errno != ENODATA && op_errno != ENOATTR)) {
stat = nfs3_cbk_errno_status (op_ret, op_errno);
goto err;
+ } else if (!dict) {
+ /* no ACL has been set */
+ stat = NFS3_OK;
+ goto err;
}
getaclreply->aclentry.aclentry_val = cs->aclentry;