X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Facl.c;h=7adbd59c7605a9e1d8e41b290ac1cb876a55c7d3;hb=5cae09a2409dcd396a1ee7be1eca7d3bbf77365e;hp=7419a3fc36adbc4f59fb2e185780d8f4a7e42bd9;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/acl.c b/lustre/obdclass/acl.c
index 7419a3f..7adbd59 100644
--- a/lustre/obdclass/acl.c
+++ b/lustre/obdclass/acl.c
@@ -38,10 +38,6 @@
  * Author: Fan Yong <fanyong@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_SEC
 
 #include <lustre_acl.h>
@@ -209,6 +205,49 @@ int lustre_posix_acl_chmod_masq(posix_acl_xattr_entry *entry, __u32 mode,
 EXPORT_SYMBOL(lustre_posix_acl_chmod_masq);
 
 /*
+ * Returns 0 if the acl can be exactly represented in the traditional
+ * file mode permission bits, or else 1. Returns -E... on error.
+ */
+	int
+lustre_posix_acl_equiv_mode(posix_acl_xattr_entry *entry, mode_t *mode_p,
+		int count)
+{
+	posix_acl_xattr_entry *pa, *pe;
+	mode_t                 mode = 0;
+	int                    not_equiv = 0;
+
+	for (pa = &entry[0], pe = &entry[count - 1]; pa <= pe; pa++) {
+		__u16 perm = le16_to_cpu(pa->e_perm);
+		switch (le16_to_cpu(pa->e_tag)) {
+			case ACL_USER_OBJ:
+				mode |= (perm & S_IRWXO) << 6;
+				break;
+			case ACL_GROUP_OBJ:
+				mode |= (perm & S_IRWXO) << 3;
+				break;
+			case ACL_OTHER:
+				mode |= perm & S_IRWXO;
+				break;
+			case ACL_MASK:
+				mode = (mode & ~S_IRWXG) |
+					((perm & S_IRWXO) << 3);
+				not_equiv = 1;
+				break;
+			case ACL_USER:
+			case ACL_GROUP:
+				not_equiv = 1;
+				break;
+			default:
+				return -EINVAL;
+		}
+	}
+	if (mode_p)
+		*mode_p = (*mode_p & ~S_IRWXUGO) | mode;
+	return not_equiv;
+}
+EXPORT_SYMBOL(lustre_posix_acl_equiv_mode);
+
+/*
  * Modify acl when creating a new object.
  */
 int lustre_posix_acl_create_masq(posix_acl_xattr_entry *entry, __u32 *pmode,