From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Fri, 1 Nov 2019 19:46:12 +0000 (-0400)
Subject: xfs_spaceman: always report sick metadata, checked or not
X-Git-Tag: v5.3.0-rc2~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9b8ae44b6ee51329af7d81968b9feacc55ffa13;p=thirdparty%2Fxfsprogs-dev.git

xfs_spaceman: always report sick metadata, checked or not

If the kernel thinks a piece of metadata is bad, we must always report
it.  This will happen with an upcoming series to mark things sick
whenever we return EFSCORRUPTED at runtime.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/spaceman/health.c b/spaceman/health.c
index 8fd985a29..0d3aa243e 100644
--- a/spaceman/health.c
+++ b/spaceman/health.c
@@ -171,10 +171,10 @@ report_sick(
 	for (f = maps; f->mask != 0; f++) {
 		if (f->has_fn && !f->has_fn(&file->xfd.fsgeom))
 			continue;
-		if (!(checked & f->mask))
+		bad = sick & f->mask;
+		if (!bad && !(checked & f->mask))
 			continue;
 		reported++;
-		bad = sick & f->mask;
 		if (!bad && quiet)
 			continue;
 		printf("%s %s: %s\n", descr, _(f->descr),