From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Mon, 12 Feb 2018 21:47:54 +0000 (-0600)
Subject: xfs_scrub: reclassify some of the warning messages
X-Git-Tag: v4.15.0-rc1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb5dbd06b7265fbc56711f37db70e72a6fd854bf;p=thirdparty%2Fxfsprogs-dev.git

xfs_scrub: reclassify some of the warning messages

Some of the warning messages are actually runtime errors in optional
components, so turn them into informational messages.

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/scrub/inodes.c b/scrub/inodes.c
index 57b773ee7..744b003c3 100644
--- a/scrub/inodes.c
+++ b/scrub/inodes.c
@@ -157,7 +157,7 @@ xfs_iterate_inodes_range(
 		bulkreq.icount = inogrp.xi_alloccount;
 		error = ioctl(ctx->mnt_fd, XFS_IOC_FSBULKSTAT, &bulkreq);
 		if (error)
-			str_warn(ctx, descr, "%s", strerror_r(errno,
+			str_info(ctx, descr, "%s", strerror_r(errno,
 						buf, DESCR_BUFSZ));
 
 		xfs_iterate_inodes_range_check(ctx, &inogrp, bstat);
@@ -181,8 +181,8 @@ xfs_iterate_inodes_range(
 				}
 				snprintf(idescr, DESCR_BUFSZ, "inode %"PRIu64,
 						(uint64_t)bs->bs_ino);
-				str_warn(ctx, idescr, "%s", strerror_r(error,
-						buf, DESCR_BUFSZ));
+				str_info(ctx, idescr,
+_("Changed too many times during scan; giving up."));
 				break;
 			case XFS_ITERATE_INODES_ABORT:
 				error = 0;
diff --git a/scrub/phase6.c b/scrub/phase6.c
index f9859509e..e255eef3f 100644
--- a/scrub/phase6.c
+++ b/scrub/phase6.c
@@ -188,7 +188,6 @@ xfs_report_verify_inode(
 	void				*arg)
 {
 	char				descr[DESCR_BUFSZ];
-	char				buf[DESCR_BUFSZ];
 	bool				moveon;
 	int				fd;
 	int				error;
@@ -209,7 +208,8 @@ xfs_report_verify_inode(
 		if (error == ESTALE)
 			return error;
 
-		str_warn(ctx, descr, "%s", strerror_r(error, buf, DESCR_BUFSZ));
+		str_info(ctx, descr,
+_("Disappeared during read error reporting."));
 		return error;
 	}