branch: b_release_1_4_6

fix compile error about ACL.

diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 6b380be..d684683 100644 (file)
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -13,7 +13,7 @@
 #ifdef __KERNEL__
 # include <linux/fs.h>
 # include <linux/dcache.h>
-# ifdef HAVE_LINUX_XATTR_ACL_H
+# ifdef CONFIG_FS_POSIX_ACL
 # include <linux/xattr_acl.h>
 # endif
 #endif

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index fec82be..49f4cd0 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -5,6 +5,11 @@
 #ifndef LLITE_INTERNAL_H
 #define LLITE_INTERNAL_H
 
+#ifdef CONFIG_FS_POSIX_ACL
+# include <linux/fs.h>
+# include <linux/xattr_acl.h>
+#endif
+
 #include <linux/lustre_debug.h>
 #include <linux/lustre_version.h>