From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Fri, 10 Jul 2020 19:35:45 +0000 (-0400)
Subject: xfs_repair: complain about any nonzero inprogress value, not just 1
X-Git-Tag: xfsprogs-5.7-fixes_2020-07-14~16
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0ce3577f448f926b1edbc4c33c25601c7074a81e;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: complain about any nonzero inprogress value, not just 1

Complain about the primary superblock having any non-zero sb_inprogress
value, not just 1.  This brings repair's behavior into alignment with
xfs_check and the kernel.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/repair/sb.c b/repair/sb.c
index 91a36dd34..17ce43cc5 100644
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -369,8 +369,7 @@ verify_sb(char *sb_buf, xfs_sb_t *sb, int is_primary_sb)
 		return(XR_BAD_VERSION);
 
 	/* does sb think mkfs really finished ? */
-
-	if (is_primary_sb && sb->sb_inprogress == 1)
+	if (is_primary_sb && sb->sb_inprogress)
 		return(XR_BAD_INPROGRESS);
 
 	/*