gNFS: Incorrect NFS ACL encoding for XFS

Problem:
Incorrect NFS ACL encoding causes "system.posix_acl_default"
setxattr failure on bricks on XFS file system. XFS (potentially
others?) doesn't understand when the 0x10 prefix is added to the
ACL type field for default ACLs (which the Linux NFS client adds)
which causes setfacl()->setxattr() to fail silently. NFS client
adds NFS_ACL_DEFAULT(0x1000) for default ACL.

FIX:
Mask the prefix (added by NFS client) OFF, so the setfacl is not
rejected when it hits the FS.

Original patch by: "Richard Wareing"

Change-Id: I17ad27d84f030cdea8396eb667ee031f0d41b396
BUG: 1009210
Signed-off-by: Santosh Kumar Pradhan <spradhan@redhat.com>
Reviewed-on: http://review.gluster.org/5980
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>

3 files changed, 4 insertions, 66 deletions

diff --git a/xlators/system/posix-acl/src/posix-acl-xattr.c b/xlators/system/posix-acl/src/posix-acl-xattr.c
index 460daf98576..cc0937c5edf 100644
--- a/xlators/system/posix-acl/src/posix-acl-xattr.c
+++ b/xlators/system/posix-acl/src/posix-acl-xattr.c
@@ -65,7 +65,7 @@ posix_acl_from_xattr (xlator_t *this, const char *xattr_buf, int xattr_size)
         count = size / sizeof (*entry);
 
         header = (struct posix_acl_xattr_header *) (xattr_buf);
-        entry = (struct posix_acl_xattr_entry *) (header + 1);
+        entry  = (struct posix_acl_xattr_entry *) (header + 1);
 
         if (header->version != htole32 (POSIX_ACL_VERSION))
                 return NULL;
@@ -126,7 +126,7 @@ posix_acl_to_xattr (xlator_t *this, struct posix_acl *acl, char *xattr_buf,
                 return size;
 
         header = (struct posix_acl_xattr_header *) (xattr_buf);
-        entry = (struct posix_acl_xattr_entry *) (header + 1);
+        entry  = (struct posix_acl_xattr_entry *) (header + 1);
         ace = acl->entries;
 
         header->version = htole32 (POSIX_ACL_VERSION);
diff --git a/xlators/system/posix-acl/src/posix-acl-xattr.h b/xlators/system/posix-acl/src/posix-acl-xattr.h
index c4e90f5f9c8..2933c205725 100644
--- a/xlators/system/posix-acl/src/posix-acl-xattr.h
+++ b/xlators/system/posix-acl/src/posix-acl-xattr.h
@@ -11,24 +11,10 @@
 #ifndef _POSIX_ACL_XATTR_H
 #define _POSIX_ACL_XATTR_H
 
-#include <stdint.h>
-
 #include "common-utils.h"
 #include "posix-acl.h"
 #include "glusterfs.h"
-
-#define POSIX_ACL_VERSION 2
-
-struct posix_acl_xattr_entry {
-        uint16_t            tag;
-        uint16_t            perm;
-        uint32_t            id;
-};
-
-struct posix_acl_xattr_header {
-        uint32_t                        version;
-        struct posix_acl_xattr_entry    entries[];
-};
+#include "glusterfs-acl.h"
 
 struct posix_acl *posix_acl_from_xattr (xlator_t *this, const char *buf, int size);
 
diff --git a/xlators/system/posix-acl/src/posix-acl.h b/xlators/system/posix-acl/src/posix-acl.h
index f8575710634..c5e01967a11 100644
--- a/xlators/system/posix-acl/src/posix-acl.h
+++ b/xlators/system/posix-acl/src/posix-acl.h
@@ -11,58 +11,10 @@
 #ifndef _POSIX_ACL_H
 #define _POSIX_ACL_H
 
-#include <stdint.h>
-
 #include "xlator.h"
 #include "common-utils.h"
 #include "byte-order.h"
-
-#define POSIX_ACL_MINIMAL_ACE_COUNT 3
-
-#define POSIX_ACL_READ                (0x04)
-#define POSIX_ACL_WRITE               (0x02)
-#define POSIX_ACL_EXECUTE             (0x01)
-
-#define POSIX_ACL_UNDEFINED_TAG       (0x00)
-#define POSIX_ACL_USER_OBJ            (0x01)
-#define POSIX_ACL_USER                (0x02)
-#define POSIX_ACL_GROUP_OBJ           (0x04)
-#define POSIX_ACL_GROUP               (0x08)
-#define POSIX_ACL_MASK                (0x10)
-#define POSIX_ACL_OTHER               (0x20)
-
-#define POSIX_ACL_UNDEFINED_ID        ((id_t)-1)
-
-
-struct posix_ace {
-        uint16_t     tag;
-        uint16_t     perm;
-        uint32_t     id;
-};
-
-
-struct posix_acl {
-        int               refcnt;
-        int               count;
-        struct posix_ace  entries[];
-};
-
-
-struct posix_acl_ctx {
-        uid_t             uid;
-        gid_t             gid;
-        mode_t            perm;
-        struct posix_acl *acl_access;
-        struct posix_acl *acl_default;
-};
-
-
-struct posix_acl_conf {
-        gf_lock_t         acl_lock;
-        uid_t             super_uid;
-        struct posix_acl *minimal_acl;
-};
-
+#include "glusterfs-acl.h"
 
 struct posix_acl *posix_acl_new (xlator_t *this, int entry_count);
 struct posix_acl *posix_acl_ref (xlator_t *this, struct posix_acl *acl);