e2fsck: allow for bigger disks when printing verbose statistics

Disks have gotten bigger, so 8 digits might not be enough.  Allow for
12 digits worth of blocks, which is more than enough for 3 petabytes.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
bitmap-optimize
Theodore Ts'o 2012-07-29 18:20:04 -04:00
parent c0a849660d
commit da0fa8f498
1 changed files with 24 additions and 23 deletions

View File

@ -154,21 +154,21 @@ static void show_stats(e2fsck_t ctx)
log_out(ctx, "\n");
}
log_out(ctx, P_("\n%8u inode used (%2.2f%%)\n",
"\n%8u inodes used (%2.2f%%)\n",
log_out(ctx, P_("\n%12u inode used (%2.2f%%)\n",
"\n%12u inodes used (%2.2f%%)\n",
inodes_used), inodes_used,
100.0 * inodes_used / inodes);
log_out(ctx, P_("%8u non-contiguous file (%0d.%d%%)\n",
"%8u non-contiguous files (%0d.%d%%)\n",
log_out(ctx, P_("%12u non-contiguous file (%0d.%d%%)\n",
"%12u non-contiguous files (%0d.%d%%)\n",
ctx->fs_fragmented),
ctx->fs_fragmented, frag_percent_file / 10,
frag_percent_file % 10);
log_out(ctx, P_("%8u non-contiguous directory (%0d.%d%%)\n",
"%8u non-contiguous directories (%0d.%d%%)\n",
log_out(ctx, P_("%12u non-contiguous directory (%0d.%d%%)\n",
"%12u non-contiguous directories (%0d.%d%%)\n",
ctx->fs_fragmented_dir),
ctx->fs_fragmented_dir, frag_percent_dir / 10,
frag_percent_dir % 10);
log_out(ctx, _(" # of inodes with ind/dind/tind blocks: "
log_out(ctx, _(" # of inodes with ind/dind/tind blocks: "
"%u/%u/%u\n"),
ctx->fs_ind_count, ctx->fs_dind_count, ctx->fs_tind_count);
@ -176,7 +176,7 @@ static void show_stats(e2fsck_t ctx)
if (ctx->extent_depth_count[j])
break;
if (++j) {
log_out(ctx, _(" Extent depth histogram: "));
log_out(ctx, _(" Extent depth histogram: "));
for (i=0; i < j; i++) {
if (i)
fputc('/', stdout);
@ -185,37 +185,38 @@ static void show_stats(e2fsck_t ctx)
log_out(ctx, "\n");
}
log_out(ctx, P_("%8llu block used (%2.2f%%)\n",
"%8llu blocks used (%2.2f%%)\n",
log_out(ctx, P_("%12llu block used (%2.2f%%)\n",
"%12llu blocks used (%2.2f%%)\n",
blocks_used), blocks_used, 100.0 * blocks_used / blocks);
log_out(ctx, P_("%8u bad block\n", "%8u bad blocks\n",
log_out(ctx, P_("%12u bad block\n", "%12u bad blocks\n",
ctx->fs_badblocks_count), ctx->fs_badblocks_count);
log_out(ctx, P_("%8u large file\n", "%8u large files\n",
log_out(ctx, P_("%12u large file\n", "%12u large files\n",
ctx->large_files), ctx->large_files);
log_out(ctx, P_("\n%8u regular file\n", "\n%8u regular files\n",
log_out(ctx, P_("\n%12u regular file\n", "\n%12u regular files\n",
ctx->fs_regular_count), ctx->fs_regular_count);
log_out(ctx, P_("%8u directory\n", "%8u directories\n",
log_out(ctx, P_("%12u directory\n", "%12u directories\n",
ctx->fs_directory_count), ctx->fs_directory_count);
log_out(ctx, P_("%8u character device file\n",
"%8u character device files\n", ctx->fs_chardev_count),
log_out(ctx, P_("%12u character device file\n",
"%12u character device files\n", ctx->fs_chardev_count),
ctx->fs_chardev_count);
log_out(ctx, P_("%8u block device file\n", "%8u block device files\n",
log_out(ctx, P_("%12u block device file\n", "%12u block device files\n",
ctx->fs_blockdev_count), ctx->fs_blockdev_count);
log_out(ctx, P_("%8u fifo\n", "%8u fifos\n", ctx->fs_fifo_count),
log_out(ctx, P_("%12u fifo\n", "%12u fifos\n", ctx->fs_fifo_count),
ctx->fs_fifo_count);
log_out(ctx, P_("%8u link\n", "%8u links\n",
log_out(ctx, P_("%12u link\n", "%12u links\n",
ctx->fs_links_count - dir_links),
ctx->fs_links_count - dir_links);
log_out(ctx, P_("%8u symbolic link", "%8u symbolic links",
log_out(ctx, P_("%12u symbolic link", "%12u symbolic links",
ctx->fs_symlinks_count), ctx->fs_symlinks_count);
log_out(ctx, P_(" (%u fast symbolic link)\n",
" (%u fast symbolic links)\n",
ctx->fs_fast_symlinks_count),
ctx->fs_fast_symlinks_count);
log_out(ctx, P_("%8u socket\n", "%8u sockets\n", ctx->fs_sockets_count),
log_out(ctx, P_("%12u socket\n", "%12u sockets\n",
ctx->fs_sockets_count),
ctx->fs_sockets_count);
log_out(ctx, "--------\n");
log_out(ctx, P_("%8u file\n", "%8u files\n",
log_out(ctx, "------------\n");
log_out(ctx, P_("%12u file\n", "%12u files\n",
ctx->fs_total_count - dir_links),
ctx->fs_total_count - dir_links);
}