Merge branch 'maint' into next

diff --cc e2fsck/pass2.c
Simple merge

diff --cc misc/e2freefrag.c
index b315263,8d805a0..c5aeab9
--- 1/misc/e2freefrag.c
--- 2/misc/e2freefrag.c
+++ b/misc/e2freefrag.c
@@@ -255,9 -152,12 +255,10 @@@ static errcode_t dump_chunk_info(ext2_f
        unsigned long start = 0, end;
        int i, retval = 0;
  
-       fprintf(f, "Total blocks: %llu\nFree blocks: %u (%0.1f%%)\n",
-               ext2fs_blocks_count(fs->super), fs->super->s_free_blocks_count,
-               (double)fs->super->s_free_blocks_count * 100 /
 -      scan_block_bitmap(fs, info);
 -
+       fprintf(f, "Total blocks: %llu\nFree blocks: %llu (%0.1f%%)\n",
+               ext2fs_blocks_count(fs->super),
+               ext2fs_free_blocks_count(fs->super),
+               (double)ext2fs_free_blocks_count(fs->super) * 100 /
                ext2fs_blocks_count(fs->super));
  
        if (info->chunkbytes) {