X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_acl.h;h=64c86f8295db95aa5483d7122564729c043be03d;hb=aa5d6bc2aa9abc745e6f590048e270c59265f699;hp=fcca1fc3d2062e7afecba0eb9bb2d758b125963a;hpb=01def2b635ff0b7bacde158d9124334c42cd5d2b;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_acl.h b/lustre/include/lustre_acl.h
index fcca1fc..64c86f8 100644
--- a/lustre/include/lustre_acl.h
+++ b/lustre/include/lustre_acl.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,8 +39,20 @@
 #ifndef _LUSTRE_ACL_H
 #define _LUSTRE_ACL_H
 
-#if defined(__linux__)
-#include <linux/lustre_acl.h>
-#endif
+#ifdef __KERNEL__
+# include <linux/fs.h>
+# include <linux/dcache.h>
+# ifdef CONFIG_FS_POSIX_ACL
+#  include <linux/posix_acl_xattr.h>
+#  define LUSTRE_POSIX_ACL_MAX_ENTRIES 32
+#  define LUSTRE_POSIX_ACL_MAX_SIZE					\
+	(sizeof(posix_acl_xattr_header) +				\
+	 LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))
+# endif /* CONFIG_FS_POSIX_ACL */
+#endif /* __KERNEL__ */
+
+#ifndef LUSTRE_POSIX_ACL_MAX_SIZE
+# define LUSTRE_POSIX_ACL_MAX_SIZE 0
+#endif /* LUSTRE_POSIX_ACL_MAX_SIZE */
 
 #endif