From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Mon, 16 Dec 2013 04:53:32 +0000 (-0500)
Subject: e2fsck: print cluster ranges when encountering bitmap errors
X-Git-Tag: v1.42.9~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69beadcfb285cb5ee254d7f53c64a3f0dc42e229;p=thirdparty%2Fe2fsprogs.git

e2fsck: print cluster ranges when encountering bitmap errors

If pass5 finds bitmap errors in a range of clusters, don't print each
cluster number individually when we could print only the start and end
cluster number.  e2fsck already does this for the non-bigalloc case.

Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
index d4bdbd8b1..4409d7fe3 100644
--- a/e2fsck/pass5.c
+++ b/e2fsck/pass5.c
@@ -411,8 +411,8 @@ redo_counts:
 			save_problem = problem;
 		} else {
 			if ((problem == save_problem) &&
-			    (pctx.blk2 == i-1))
-				pctx.blk2++;
+			    (pctx.blk2 == i - EXT2FS_CLUSTER_RATIO(fs)))
+				pctx.blk2 += EXT2FS_CLUSTER_RATIO(fs);
 			else {
 				print_bitmap_problem(ctx, save_problem, &pctx);
 				pctx.blk = pctx.blk2 = i;