1 files changed, 10 insertions, 21 deletions
diff --git a/xlators/system/posix-acl/src/posix-acl-xattr.h b/xlators/system/posix-acl/src/posix-acl-xattr.h
index c4e90f5f9c8..e5bc4a17ac6 100644
--- a/xlators/system/posix-acl/src/posix-acl-xattr.h
+++ b/xlators/system/posix-acl/src/posix-acl-xattr.h
@@ -11,30 +11,19 @@
 #ifndef _POSIX_ACL_XATTR_H
 #define _POSIX_ACL_XATTR_H
 
-#include <stdint.h>
-
-#include "common-utils.h"
+#include <glusterfs/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[];
-};
-
-struct posix_acl *posix_acl_from_xattr (xlator_t *this, const char *buf, int size);
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/glusterfs-acl.h>
 
-int posix_acl_to_xattr (xlator_t *this, struct posix_acl *acl, char *buf, int size);
+struct posix_acl *
+posix_acl_from_xattr(xlator_t *this, const char *buf, int size);
 
-int posix_acl_matches_xattr (xlator_t *this, struct posix_acl *acl, const char *buf, int size);
+int
+posix_acl_to_xattr(xlator_t *this, struct posix_acl *acl, char *buf, int size);
 
+int
+posix_acl_matches_xattr(xlator_t *this, struct posix_acl *acl, const char *buf,
+                        int size);
 
 #endif /* !_POSIX_ACL_XATTR_H */