X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_eacl.h;h=68062dc82973fd9c59f075397d31f94ff549dd59;hb=497f520fa341fe2352400c7e5fbc6917b129ff70;hp=347a8dc2741953f9bf8e7eb2e7df862b115d4339;hpb=19b2bc9bbc25a94395465fba5900c1f862b5c6a1;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
index 347a8dc..68062dc 100644
--- a/lustre/include/lustre_eacl.h
+++ b/lustre/include/lustre_eacl.h
@@ -48,24 +48,6 @@
 # include <linux/fs.h>
 # include <lustre_compat.h>
 
-typedef struct {
-        __u16                   e_tag;
-        __u16                   e_perm;
-        __u32                   e_id;
-        __u32                   e_stat;
-} ext_acl_xattr_entry;
-
-typedef struct {
-        __u32                   a_count;
-        ext_acl_xattr_entry     a_entries[0];
-} ext_acl_xattr_header;
-
-#define CFS_ACL_XATTR_SIZE(count, prefix) \
-        (sizeof(prefix ## _header) + (count) * sizeof(prefix ## _entry))
-
-#define CFS_ACL_XATTR_COUNT(size, prefix) \
-        (((size) - sizeof(prefix ## _header)) / sizeof(prefix ## _entry))
-
 #ifdef HAVE_SERVER_SUPPORT
 struct lu_ucred;
 struct lu_attr;
@@ -77,7 +59,8 @@ struct lustre_idmap_table;
 #endif
 
 extern int lustre_posix_acl_permission(struct lu_ucred *mu,
-					const struct lu_attr *la, int want,
+					const struct lu_attr *la,
+					unsigned int may_mask,
 					posix_acl_xattr_entry *entry,
 					int count);
 extern int lustre_posix_acl_chmod_masq(posix_acl_xattr_entry *entry,