| Message ID | 151787297178.3743.12195489468667039346.stgit@magnolia (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 2/5/18 5:22 PM, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > 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> > --- > scrub/inodes.c | 6 +++--- > scrub/phase6.c | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > > diff --git a/scrub/inodes.c b/scrub/inodes.c > index 57b773e..744b003 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 f985950..e255eef 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; > } > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Feb 12, 2018 at 9:53 PM, Eric Sandeen <sandeen@sandeen.net> wrote: > > > On 2/5/18 5:22 PM, Darrick J. Wong wrote: >> From: Darrick J. Wong <darrick.wong@oracle.com> >> >> 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> Reviewed-by: Jan Tulak <jtulak@redhat.com> > >> --- >> scrub/inodes.c | 6 +++--- >> scrub/phase6.c | 4 ++-- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> >> diff --git a/scrub/inodes.c b/scrub/inodes.c >> index 57b773e..744b003 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 f985950..e255eef 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; >> } >> >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scrub/inodes.c b/scrub/inodes.c index 57b773e..744b003 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 f985950..e255eef 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; }