From 3f6de92999cf63e234265f51d6ee02134bc75ac3 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 12 Jun 2019 11:02:51 +0200
Subject: [PATCH 24/24] findmnt: (verify) ignore passno for XFS

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1719069
Upstream: http://github.com/karelzak/util-linux/commit/f5b7bf155b9881de5b99cc0a23b4dccf9a2d4af3
Signed-off-by: Karel Zak <kzak@redhat.com>
---
 misc-utils/findmnt-verify.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/misc-utils/findmnt-verify.c b/misc-utils/findmnt-verify.c
index 1cc62def9..73e44a418 100644
--- a/misc-utils/findmnt-verify.c
+++ b/misc-utils/findmnt-verify.c
@@ -28,7 +28,8 @@ struct verify_context {
 	int	nwarnings;
 	int	nerrors;
 
-	unsigned int	target_printed : 1;
+	unsigned int	target_printed : 1,
+			no_fsck : 1;
 };
 
 static void verify_mesg(struct verify_context *vfy, char type, const char *fmt, va_list ap)
@@ -408,6 +409,8 @@ static int verify_fstype(struct verify_context *vfy)
 			isauto = 1;
 		else if (strcmp(type, "swap") == 0)
 			isswap = 1;
+		else if (strcmp(type, "xfs") == 0)
+			vfy->no_fsck = 1;
 
 		if (!isswap && !isauto && !none && !is_supported_filesystem(vfy, type))
 			verify_warn(vfy, _("%s seems unsupported by the current kernel"), type);
@@ -422,6 +425,7 @@ static int verify_fstype(struct verify_context *vfy)
 
 	if (realtype) {
 		isswap = strcmp(realtype, "swap") == 0;
+		vfy->no_fsck = strcmp(realtype, "xfs") == 0;
 
 		if (type && !isauto && strcmp(type, realtype) != 0)
 			return verify_err(vfy, _("%s does not match with on-disk %s"), type, realtype);
@@ -440,7 +444,7 @@ static int verify_passno(struct verify_context *vfy)
 	int passno = mnt_fs_get_passno(vfy->fs);
 	const char *tgt = mnt_fs_get_target(vfy->fs);
 
-	if (tgt && strcmp("/", tgt) == 0 && passno != 1)
+	if (tgt && strcmp("/", tgt) == 0 && passno != 1 && !vfy->no_fsck)
 		return verify_warn(vfy, _("recommended root FS passno is 1 (current is %d)"), passno);
 
 	return 0;
@@ -463,7 +467,7 @@ static int verify_filesystem(struct verify_context *vfy)
 	if (!rc)
 		rc = verify_fstype(vfy);
 	if (!rc)
-		rc = verify_passno(vfy);
+		rc = verify_passno(vfy);	/* depends on verify_fstype() */
 
 	return rc;
 }
@@ -492,6 +496,8 @@ int verify_table(struct libmnt_table *tb)
 
 	while (rc == 0 && (vfy.fs = get_next_fs(tb, itr))) {
 		vfy.target_printed = 0;
+		vfy.no_fsck = 0;
+
 		if (check_order)
 			rc = verify_order(&vfy);
 		if (!rc)
-- 
2.21.0