From: Yongqiang Yang <xiaoqiangnk@gmail.com>
Date: Fri, 16 Sep 2011 13:25:51 +0000 (-0400)
Subject: e2fsck: fix error in computing blocks of the ending group
X-Git-Tag: v1.42-WIP-0916~6
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=32318ff20f848a18d39e22c93ca06d5444651cd1;p=tools%2Fe2fsprogs.git

e2fsck: fix error in computing blocks of the ending group

If the blocks of a filesystem is a multiple of blocks_per_group,
blocks of the ending group is computed wrongly.  Use the
new ext2fs_group_blocks_count() helper instead.

Eric Sandeen: Converted to use new blocks per group helper

Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
index cf37556..d4b0868 100644
--- a/e2fsck/pass5.c
+++ b/e2fsck/pass5.c
@@ -226,9 +226,8 @@ redo_counts:
 				count = 0;
 				cmp_block = fs->super->s_clusters_per_group;
 				if (group == (int)fs->group_desc_count - 1)
-					cmp_block =
-						EXT2FS_NUM_B2C(fs,
-		ext2fs_blocks_count(fs->super) % fs->super->s_blocks_per_group);
+					cmp_block = EXT2FS_NUM_B2C(fs,
+						    ext2fs_group_blocks_count(fs, group));
 			}
 
 			bitmap = 0;