From: Artem Blagodarenko <artem.blagodarenko@seagate.com>
Date: Mon, 26 Dec 2016 09:53:47 +0000 (+0300)
Subject: LU-8974 osd-ldiskfs: increase supported ldiskfs fs size
X-Git-Tag: 2.9.53~4
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=cfa981f3bf06d602aee998e64d4758e13f48aab8;hp=d2c403363f65337166dc745b58d0a4529a534b84

LU-8974 osd-ldiskfs: increase supported ldiskfs fs size

Change "force_over_256tb" mount option to "force_over_512tb".

Seagate-bug-id: MRP-4077
Signed-off-by: Artem Blagodarenko <artem.blagodarenko@seagate.com>
Change-Id: I4b0c1d9faf2139f2b4fc4ff94ed78af5e218110d
Reviewed-on: https://review.whamcloud.com/24524
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index c82c26c..a928e77 100644
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -6722,7 +6722,7 @@ static int osd_mount(const struct lu_env *env,
 	struct osd_thread_info	*info = osd_oti_get(env);
 	struct lu_fid		*fid = &info->oti_fid;
 	struct inode		*inode;
-	int			 rc = 0, force_over_256tb = 0;
+	int			 rc = 0, force_over_512tb = 0;
         ENTRY;
 
 	if (o->od_mnt != NULL)
@@ -6746,15 +6746,25 @@ static int osd_mount(const struct lu_env *env,
 		RETURN(-EINVAL);
 	}
 #endif
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
 	if (opts != NULL && strstr(opts, "force_over_128tb") != NULL) {
-		CWARN("force_over_128tb option is depricated."
-		      "Filesystems less then 256TB can be created without any"
-		      "force options. Use force_over_256tb option for"
-		      "filesystems greather then 256TB.\n");
+		CWARN("force_over_128tb option is deprecated. "
+		      "Filesystems less than 512TB can be created without any "
+		      "force options. Use force_over_512tb option for "
+		      "filesystems greater than 512TB.\n");
 	}
+#endif
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 1, 53, 0)
+	if (opts != NULL && strstr(opts, "force_over_256tb") != NULL) {
+		CWARN("force_over_256tb option is deprecated. "
+		      "Filesystems less than 512TB can be created without any "
+		      "force options. Use force_over_512tb option for "
+		      "filesystems greater than 512TB.\n");
+	}
+#endif
 
-	if (opts != NULL && strstr(opts, "force_over_256tb") != NULL)
-		force_over_256tb = 1;
+	if (opts != NULL && strstr(opts, "force_over_512tb") != NULL)
+		force_over_512tb = 1;
 
 	__page = alloc_page(GFP_KERNEL);
 	if (__page == NULL)
@@ -6773,12 +6783,9 @@ static int osd_mount(const struct lu_env *env,
 			"noextents",
 			/* strip out option we processed in osd */
 			"bigendian_extents",
-#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(3,0,53,0)
-#warning "remove force_over_128 option"
-#else
-			"force_over_128tb (deprecated)",
-#endif
+			"force_over_128tb",
 			"force_over_256tb",
+			"force_over_512tb",
 			NULL
 		};
 		strcat(options, opts);
@@ -6824,11 +6831,12 @@ static int osd_mount(const struct lu_env *env,
 		GOTO(out, rc);
 	}
 
-	if (ldiskfs_blocks_count(LDISKFS_SB(osd_sb(o))->s_es) > (64ULL << 30) &&
-	    force_over_256tb == 0) {
+	if (ldiskfs_blocks_count(LDISKFS_SB(osd_sb(o))->s_es) <<
+				 osd_sb(o)->s_blocksize_bits > 512ULL << 40 &&
+				 force_over_512tb == 0) {
 		CERROR("%s: device %s LDISKFS does not support filesystems "
-		       "greater than 256TB and can cause data corruption. "
-		       "Use \"force_over_256tb\" mount option to override.\n",
+		       "greater than 512TB and can cause data corruption. "
+		       "Use \"force_over_512tb\" mount option to override.\n",
 		       name, dev);
 		GOTO(out, rc = -EINVAL);
 	}