Merge tag 'upstream-4.9-rc2' of git://git.infradead.org/linux-ubifs

[cascardo/linux.git] / include / linux / posix_acl_xattr.h

diff --git a/include/linux/posix_acl_xattr.h b/include/linux/posix_acl_xattr.h
index e5e8ec4..8b867e3 100644 (file)
--- a/include/linux/posix_acl_xattr.h
+++ b/include/linux/posix_acl_xattr.h
@@ -10,42 +10,25 @@
 #define _POSIX_ACL_XATTR_H
 
 #include <uapi/linux/xattr.h>
+#include <uapi/linux/posix_acl_xattr.h>
 #include <linux/posix_acl.h>
 
-/* Supported ACL a_version fields */
-#define POSIX_ACL_XATTR_VERSION        0x0002
-
-/* An undefined entry e_id value */
-#define ACL_UNDEFINED_ID       (-1)
-
-typedef struct {
-       __le16                  e_tag;
-       __le16                  e_perm;
-       __le32                  e_id;
-} posix_acl_xattr_entry;
-
-typedef struct {
-       __le32                  a_version;
-       posix_acl_xattr_entry   a_entries[0];
-} posix_acl_xattr_header;
-
-
 static inline size_t
 posix_acl_xattr_size(int count)
 {
-       return (sizeof(posix_acl_xattr_header) +
-               (count * sizeof(posix_acl_xattr_entry)));
+       return (sizeof(struct posix_acl_xattr_header) +
+               (count * sizeof(struct posix_acl_xattr_entry)));
 }
 
 static inline int
 posix_acl_xattr_count(size_t size)
 {
-       if (size < sizeof(posix_acl_xattr_header))
+       if (size < sizeof(struct posix_acl_xattr_header))
                return -1;
-       size -= sizeof(posix_acl_xattr_header);
-       if (size % sizeof(posix_acl_xattr_entry))
+       size -= sizeof(struct posix_acl_xattr_header);
+       if (size % sizeof(struct posix_acl_xattr_entry))
                return -1;
-       return size / sizeof(posix_acl_xattr_entry);
+       return size / sizeof(struct posix_acl_xattr_entry);
 }
 
 #ifdef CONFIG_FS_POSIX_ACL