diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2011-02-27 19:47:44 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-02-27 19:47:44 -0500 |
| commit | 829d9994880394e48c883510799b1536812d6efb (patch) | |
| tree | e21afba233d49f4fcf600bd6b632610297e70368 /misc/mke2fs.c | |
| parent | 7d9e31655fca48e9d6c2647ad443124113508b73 (diff) | |
| parent | 412376efff3c0e0c2fea00666c2457e6f2ae1878 (diff) | |
| download | e2fsprogs-829d9994880394e48c883510799b1536812d6efb.tar.gz | |
Merge branch 'maint' into next
Conflicts:
lib/ext2fs/initialize.c
Diffstat (limited to 'misc/mke2fs.c')
| -rw-r--r-- | misc/mke2fs.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 23f8c103..7866c2c1 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -560,8 +560,13 @@ static void show_stats(ext2_filsys fs) free(os); printf(_("Block size=%u (log=%u)\n"), fs->blocksize, s->s_log_block_size); - printf(_("Fragment size=%u (log=%u)\n"), fs->fragsize, - s->s_log_frag_size); + if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, + EXT4_FEATURE_RO_COMPAT_BIGALLOC)) + printf(_("Cluster size=%u (log=%u)\n"), + fs->clustersize, s->s_log_cluster_size); + else + printf(_("Fragment size=%u (log=%u)\n"), fs->clustersize, + s->s_log_cluster_size); printf(_("Stride=%u blocks, Stripe width=%u blocks\n"), s->s_raid_stride, s->s_raid_stripe_width); printf(_("%u inodes, %llu blocks\n"), s->s_inodes_count, @@ -578,8 +583,13 @@ static void show_stats(ext2_filsys fs) printf(_("%u block groups\n"), fs->group_desc_count); else printf(_("%u block group\n"), fs->group_desc_count); - printf(_("%u blocks per group, %u fragments per group\n"), - s->s_blocks_per_group, s->s_frags_per_group); + if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, + EXT4_FEATURE_RO_COMPAT_BIGALLOC)) + printf(_("%u blocks per group, %u clusters per group\n"), + s->s_blocks_per_group, s->s_clusters_per_group); + else + printf(_("%u blocks per group, %u fragments per group\n"), + s->s_blocks_per_group, s->s_clusters_per_group); printf(_("%u inodes per group\n"), s->s_inodes_per_group); if (fs->group_desc_count == 1) { @@ -1274,8 +1284,6 @@ profile_error: optarg); exit(1); } - fs_param.s_log_frag_size = - int_log2(size >> EXT2_MIN_BLOCK_LOG_SIZE); fprintf(stderr, _("Warning: fragments not supported. " "Ignoring -f option\n")); break; @@ -1507,7 +1515,7 @@ profile_error: check_plausibility(device_name); check_mount(device_name, force, _("filesystem")); - fs_param.s_log_frag_size = fs_param.s_log_block_size; + fs_param.s_log_cluster_size = fs_param.s_log_block_size; /* Determine the size of the device (if possible) */ if (noaction && fs_blocks_count) { @@ -1751,7 +1759,7 @@ profile_error: inode_ratio = blocksize; } - fs_param.s_log_frag_size = fs_param.s_log_block_size = + fs_param.s_log_cluster_size = fs_param.s_log_block_size = int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE); #ifdef HAVE_BLKID_PROBE_GET_TOPOLOGY |