b=21174 fix quotacheck with non-consecutive OST indices

[fs/lustre-release.git] / lustre / utils / mkfs_lustre.c

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 5c11296..0e62785 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -517,34 +517,29 @@ static int is_e2fsprogs_feature_supp(const char *feature)
         return ret;
 }
 
-static void disp_old_kernel_msg(char *feature)
-{
-       fprintf(stderr, "WARNING: ldiskfs filesystem does not support \"%s\" "
-               "feature.\n\n", feature);
-}
-
 static void enable_default_backfs_features(struct mkfs_opts *mop)
 {
         struct utsname uts;
-        int maj_high, maj_low, min;
         int ret;
 
-        if (IS_MDT(&mop->mo_ldd))
-                strscat(mop->mo_mkfsopts, " -O dir_index,extents,dirdata",
-                                sizeof(mop->mo_mkfsopts));
-        else
+        if (IS_OST(&mop->mo_ldd))
                 strscat(mop->mo_mkfsopts, " -O dir_index,extents",
-                                sizeof(mop->mo_mkfsopts));
-
+                        sizeof(mop->mo_mkfsopts));
+        else if (IS_MDT(&mop->mo_ldd))
+                strscat(mop->mo_mkfsopts, " -O dir_index,dirdata",
+                        sizeof(mop->mo_mkfsopts));
+        else
+                strscat(mop->mo_mkfsopts, " -O dir_index",
+                        sizeof(mop->mo_mkfsopts));
 
         /* Upstream e2fsprogs called our uninit_groups feature uninit_bg,
          * check for both of them when testing e2fsprogs features. */
-        if (is_e2fsprogs_feature_supp("uninit_groups") == 0)
-                strscat(mop->mo_mkfsopts, ",uninit_groups",
-                        sizeof(mop->mo_mkfsopts));
-        else if (is_e2fsprogs_feature_supp("uninit_bg") == 0)
+        if (is_e2fsprogs_feature_supp("uninit_bg") == 0)
                 strscat(mop->mo_mkfsopts, ",uninit_bg",
                         sizeof(mop->mo_mkfsopts));
+        else if (is_e2fsprogs_feature_supp("uninit_groups") == 0)
+                strscat(mop->mo_mkfsopts, ",uninit_groups",
+                        sizeof(mop->mo_mkfsopts));
         else
                 disp_old_e2fsprogs_msg("uninit_bg", 1);
 
@@ -552,22 +547,14 @@ static void enable_default_backfs_features(struct mkfs_opts *mop)
         if (ret)
                 return;
 
-        sscanf(uts.release, "%d.%d.%d", &maj_high, &maj_low, &min);
-        printf("%d %d %d\n", maj_high, maj_low, min);
-
         /* Multiple mount protection is enabled only if failover node is
          * specified and if kernel version is higher than 2.6.9 */
         if (failover) {
-                if (KERNEL_VERSION(maj_high, maj_low, min) >=
-                    KERNEL_VERSION(2,6,9)) {
-                        if (is_e2fsprogs_feature_supp("mmp") == 0)
-                                strscat(mop->mo_mkfsopts, ",mmp",
-                                        sizeof(mop->mo_mkfsopts));
-                        else
-                                disp_old_e2fsprogs_msg("mmp", 1);
-                } else {
-                        disp_old_kernel_msg("mmp");
-                }
+                if (is_e2fsprogs_feature_supp("mmp") == 0)
+                        strscat(mop->mo_mkfsopts, ",mmp",
+                                sizeof(mop->mo_mkfsopts));
+                else
+                        disp_old_e2fsprogs_msg("mmp", 1);
         }
 }
 /* Build fs according to type */
@@ -600,6 +587,11 @@ int make_lustre_backfs(struct mkfs_opts *mop)
                         return EINVAL;
                 }
                 block_count = mop->mo_device_sz / (L_BLOCK_SIZE >> 10);
+                /* If the LUN size is just over 2^32 blocks, limit the
+                 * filesystem size to 2^32-1 blocks to avoid problems with
+                 * ldiskfs/mkfs not handling this size.  Bug 22906 */
+                if (block_count > 0xffffffffULL && block_count < 0x100002000ULL)
+                        block_count = 0xffffffffULL;
         }
 
         if ((mop->mo_ldd.ldd_mount_type == LDD_MT_EXT3) ||