Land b_head_quota onto HEAD (20081116_0105)

[fs/lustre-release.git] / lustre / include / linux / lustre_acl.h

diff --git a/lustre/include/linux/lustre_acl.h b/lustre/include/linux/lustre_acl.h
index ba7abb1..cfdc247 100644 (file)
--- a/lustre/include/linux/lustre_acl.h
+++ b/lustre/include/linux/lustre_acl.h
@@ -39,8 +39,12 @@
  * See also lustre_idl.h for wire formats of requests.
  */
 
-#ifndef _LUSTRE_ACL_H
-#define _LUSTRE_ACL_H
+#ifndef _LUSTRE_LINUX_ACL_H
+#define _LUSTRE_LINUX_ACL_H
+
+#ifndef        _LUSTRE_ACL_H
+#error Shoud not include direectly. use #include <lustre_acl.h> instead
+#endif
 
 #ifdef __KERNEL__
 # include <linux/fs.h>
@@ -72,10 +76,14 @@
 
 # define LUSTRE_POSIX_ACL_MAX_ENTRIES   (32)
 
+#ifdef __KERNEL__
 # define LUSTRE_POSIX_ACL_MAX_SIZE   XATTR_ACL_SIZE
+#else
+# define LUSTRE_POSIX_ACL_MAX_SIZE   0
+#endif
 
 # else /* CONFIG_FS_POSIX_ACL */
 # define LUSTRE_POSIX_ACL_MAX_SIZE      0
 # endif /* CONFIG_FS_POSIX_ACL */
 
-#endif /* _LUSTRE_ACL_H */
+#endif /* _LUSTRE_LINUX_ACL_H */