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 57b773ee7638b55b035205ffd663eb01bb99a0cd..744b003c339f553a8d76b9d26b957f80b2dc1dfd 100644 (file)
--- 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 f9859509e64390590151266466120d6857da96ce..e255eef3fe0d922cee7705b0d607aa6cdf258a05 100644 (file)
--- 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;
        }