LU-8130 obd: remove used HASH_CL_ENV_[BKT]_BITS

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

diff --git a/lustre/include/lustre_acl.h b/lustre/include/lustre_acl.h
index 92dba42..487fb8e 100644 (file)
--- a/lustre/include/lustre_acl.h
+++ b/lustre/include/lustre_acl.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,16 +37,16 @@
 
 #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                                     \
+# 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
-# define LUSTRE_POSIX_ACL_MAX_SIZE 0
+#ifndef LUSTRE_POSIX_ACL_MAX_SIZE_OLD
+# define LUSTRE_POSIX_ACL_MAX_SIZE_OLD 0
 #endif /* LUSTRE_POSIX_ACL_MAX_SIZE */
 
 #endif