From: Andreas Dilger <andreas.dilger@intel.com>
Date: Thu, 19 Dec 2013 20:57:08 +0000 (-0700)
Subject: LU-4217 build: bump build warnings to 2.7 development
X-Git-Tag: 2.5.53~1
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=da588d8778b7ec942f4a16f7c9d554bb1f0088a5

LU-4217 build: bump build warnings to 2.7 development

The "acl" mount option on the client has been deprecated since
Lustre 1.8 (using ACLs is enforced by the admin on the MDS).
Unfortunately, there are still configs using this option, so
it cannot be removed yet, or it would cause an error at mount time.

The DNE cross-MDT locking depends on cross-MDT rename support, so
is also pushed to 2.6.53, but is expected to be fixed sooner.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: Idcfe68eaec12df08538f1479a13c2c208c3ebbe5
Reviewed-on: http://review.whamcloud.com/8627
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index cd6e832..eef54b1 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -819,22 +819,22 @@ static int ll_options(char *options, int *flags)
                         *flags &= ~tmp;
                         goto next;
                 }
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 5, 53, 0)
-                tmp = ll_set_opt("acl", s1, LL_SBI_ACL);
-                if (tmp) {
-                        /* Ignore deprecated mount option.  The client will
-                         * always try to mount with ACL support, whether this
-                         * is used depends on whether server supports it. */
-                        LCONSOLE_ERROR_MSG(0x152, "Ignoring deprecated "
-                                                  "mount option 'acl'.\n");
-                        goto next;
-                }
-                tmp = ll_set_opt("noacl", s1, LL_SBI_ACL);
-                if (tmp) {
-                        LCONSOLE_ERROR_MSG(0x152, "Ignoring deprecated "
-                                                  "mount option 'noacl'.\n");
-                        goto next;
-                }
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 51, 0)
+		tmp = ll_set_opt("acl", s1, LL_SBI_ACL);
+		if (tmp) {
+			/* Ignore deprecated mount option.  The client will
+			 * always try to mount with ACL support, whether this
+			 * is used depends on whether server supports it. */
+			LCONSOLE_ERROR_MSG(0x152, "Ignoring deprecated "
+						  "mount option 'acl'.\n");
+			goto next;
+		}
+		tmp = ll_set_opt("noacl", s1, LL_SBI_ACL);
+		if (tmp) {
+			LCONSOLE_ERROR_MSG(0x152, "Ignoring deprecated "
+						  "mount option 'noacl'.\n");
+			goto next;
+		}
 #else
 #warning "{no}acl options have been deprecated since 1.8, please remove them"
 #endif
diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index c7436c8..48f4f27 100644
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -1061,7 +1061,7 @@ static int mdt_rename_lock(struct mdt_thread_info *info,
 
 	memset(policy, 0, sizeof *policy);
 	policy->l_inodebits.bits = MDS_INODELOCK_UPDATE;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 5, 53, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 53, 0)
 	/* In phase I, we will not do cross-rename, so local BFL lock would
 	 * be enough
 	 */