From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 5 Dec 2017 03:24:01 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.44.0-rc1~37
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=edc14d97d0de738e73ca5808b36ab613e3ac2891;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

edc14d97d0de738e73ca5808b36ab613e3ac2891
diff --cc misc/e2freefrag.c
index b315263,8d805a0..c5aeab9
--- a/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) {