From 9be90b54a892851bd9c47a1b25a7feede1843e55 Mon Sep 17 00:00:00 2001
From: walter <walter>
Date: Mon, 1 Oct 2007 19:27:12 +0000
Subject: [PATCH] b=13491 i=green i=adilger
---
lustre/include/linux/lustre_acl.h | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/lustre/include/linux/lustre_acl.h b/lustre/include/linux/lustre_acl.h
index e02889124e..bfa393e0df 100644
--- a/lustre/include/linux/lustre_acl.h
+++ b/lustre/include/linux/lustre_acl.h
@@ -20,20 +20,27 @@
/* ACL */
#ifdef CONFIG_FS_POSIX_ACL
-#ifdef HAVE_XATTR_ACL
+# ifdef HAVE_XATTR_ACL
# define MDS_XATTR_NAME_ACL_ACCESS XATTR_NAME_ACL_ACCESS
# define mds_xattr_acl_size(entry) xattr_acl_size(entry)
-# else
+# else /* HAVE_XATTR_ACL */
# define MDS_XATTR_NAME_ACL_ACCESS POSIX_ACL_XATTR_ACCESS
# define mds_xattr_acl_size(entry) posix_acl_xattr_size(entry)
-# endif
+# endif /* HAVE_XATTR_ACL */
+
# define LUSTRE_POSIX_ACL_MAX_ENTRIES (32)
+
+# ifdef __KERNEL__
# define LUSTRE_POSIX_ACL_MAX_SIZE \
(sizeof(xattr_acl_header) + \
LUSTRE_POSIX_ACL_MAX_ENTRIES * \
sizeof(xattr_acl_entry))
-#else
+# else /* __KERNEL__ */
+# define LUSTRE_POSIX_ACL_MAX_SIZE 0
+# endif /* __KERNEL__ */
+
+#else /* CONFIG_FS_POSIX_ACL */
# define LUSTRE_POSIX_ACL_MAX_SIZE 0
-#endif
+#endif /* CONFIG_FS_POSIX_ACL */
-#endif
+#endif /* _LUSTRE_ACL_H */
--
GitLab