X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_eacl.h;h=347a8dc2741953f9bf8e7eb2e7df862b115d4339;hb=3e23353201a753104d1fcdab28353646e40644dc;hp=965fd6c0cfd4baf1ac272f0c79e02129502d9e71;hpb=9d06de39731ae16d030cda672ae771496d4f0952;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_eacl.h b/lustre/include/lustre_eacl.h
index 965fd6c..347a8dc 100644
--- a/lustre/include/lustre_eacl.h
+++ b/lustre/include/lustre_eacl.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -28,7 +24,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -48,9 +44,9 @@
  * @{
  */
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
 # include <linux/fs.h>
-# include <linux/posix_acl_xattr.h>
+# include <lustre_compat.h>
 
 typedef struct {
         __u16                   e_tag;
@@ -75,6 +71,11 @@ struct lu_ucred;
 struct lu_attr;
 struct lustre_idmap_table;
 
+#ifdef HAVE_STRUCT_POSIX_ACL_XATTR
+# define posix_acl_xattr_header struct posix_acl_xattr_header
+# define posix_acl_xattr_entry  struct posix_acl_xattr_entry
+#endif
+
 extern int lustre_posix_acl_permission(struct lu_ucred *mu,
 					const struct lu_attr *la, int want,
 					posix_acl_xattr_entry *entry,
@@ -86,7 +87,7 @@ extern int lustre_posix_acl_create_masq(posix_acl_xattr_entry *entry,
 extern int lustre_posix_acl_equiv_mode(posix_acl_xattr_entry *entry, mode_t *mode_p,
 				       int count);
 #endif /* HAVE_SERVER_SUPPORT */
-#endif /* CONFIG_FS_POSIX_ACL */
+#endif /* CONFIG_LUSTRE_FS_POSIX_ACL */
 
 /** @} eacl */