X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_acl.h;h=166e1bd10994ae0864c984dc6312fc6f31ee5256;hb=ac0380dc519aa15310670d164e98453861ef332a;hp=933d09ab4ef1fb5260a492a658f08f472b9ef242;hpb=ccabce23bd9e366c345c852f565766a799f61238;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_acl.h b/lustre/include/lustre_acl.h
index 933d09a..166e1bd 100644
--- a/lustre/include/lustre_acl.h
+++ b/lustre/include/lustre_acl.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/include/lustre_acl.h
  */
@@ -37,13 +36,13 @@
 
 #include <linux/fs.h>
 #include <linux/dcache.h>
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
 # include <linux/posix_acl_xattr.h>
 # define LUSTRE_POSIX_ACL_MAX_ENTRIES 32
 # define LUSTRE_POSIX_ACL_MAX_SIZE_OLD					\
 	(sizeof(posix_acl_xattr_header) +				\
 	 LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))
-#endif /* CONFIG_FS_POSIX_ACL */
+#endif /* CONFIG_LUSTRE_FS_POSIX_ACL */
 
 #ifndef LUSTRE_POSIX_ACL_MAX_SIZE_OLD
 # define LUSTRE_POSIX_ACL_MAX_SIZE_OLD 0