mke2fs: the -g option will now specify the clusters per block group

If bigalloc is enabled, then -g will specify the clusters per block
group.  (If bigalloc is not enabled, then a cluster == a block, so the
meaning of -g is not changed.)

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 98c2035..2103f63 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1962,6 +1962,15 @@ profile_error:
                }
        }
 
+       /*
+        * If the bigalloc feature is enabled, then the -g option will
+        * specify the number of clusters per group.
+        */
+       if (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_BIGALLOC) {
+               fs_param.s_clusters_per_group = fs_param.s_blocks_per_group;
+               fs_param.s_blocks_per_group = 0;
+       }
+
        if (inode_size == 0)
                inode_size = get_int_from_profile(fs_types, "inode_size", 0);
        if (!flex_bg_size && (fs_param.s_feature_incompat &