diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-11-01 17:55:06 -0400 |
|---|---|---|
| committer | Eric Sandeen <sandeen@sandeen.net> | 2019-11-01 17:55:06 -0400 |
| commit | e98616ba9dc9bc457dcc111f97b33a88c6221850 (patch) | |
| tree | 830e6a2673221dc72dabce9a302eacef390f76af | |
| parent | e3724c8b82a3206284c16b26d3676aaa1b5f7528 (diff) | |
| download | xfsprogs-dev-e98616ba9dc9bc457dcc111f97b33a88c6221850.tar.gz | |
xfs_scrub: fix misclassified error reporting
Fix a few places where we assign error reports to the wrong
classification.
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>
| -rw-r--r-- | scrub/fscounters.c | 2 | ||||
| -rw-r--r-- | scrub/inodes.c | 4 | ||||
| -rw-r--r-- | scrub/phase1.c | 2 | ||||
| -rw-r--r-- | scrub/xfs_scrub.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scrub/fscounters.c b/scrub/fscounters.c index 98aa3826e7..e064c865d2 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -48,7 +48,7 @@ xfs_count_inodes_ag( ireq = xfrog_inumbers_alloc_req(64, 0); if (!ireq) { - str_info(ctx, descr, _("Insufficient memory; giving up.")); + str_liberror(ctx, ENOMEM, _("allocating inumbers request")); return false; } xfrog_inumbers_set_ag(ireq, agno); diff --git a/scrub/inodes.c b/scrub/inodes.c index 7c04d7f6c8..71e53bb611 100644 --- a/scrub/inodes.c +++ b/scrub/inodes.c @@ -126,13 +126,13 @@ xfs_iterate_inodes_ag( breq = xfrog_bulkstat_alloc_req(XFS_INODES_PER_CHUNK, 0); if (!breq) { - str_info(ctx, descr, _("Insufficient memory; giving up.")); + str_liberror(ctx, ENOMEM, _("allocating bulkstat request")); return false; } ireq = xfrog_inumbers_alloc_req(1, 0); if (!ireq) { - str_info(ctx, descr, _("Insufficient memory; giving up.")); + str_liberror(ctx, ENOMEM, _("allocating inumbers request")); free(breq); return false; } diff --git a/scrub/phase1.c b/scrub/phase1.c index 3211a488a5..d040c4a89b 100644 --- a/scrub/phase1.c +++ b/scrub/phase1.c @@ -127,7 +127,7 @@ _("Not an XFS filesystem.")); if (!xfs_action_lists_alloc(ctx->mnt.fsgeom.agcount, &ctx->action_lists)) { - str_error(ctx, ctx->mntpoint, _("Not enough memory.")); + str_liberror(ctx, ENOMEM, _("allocating action lists")); return false; } diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c index 147c114c8f..e9fc3650de 100644 --- a/scrub/xfs_scrub.c +++ b/scrub/xfs_scrub.c @@ -738,7 +738,7 @@ main( str_info(&ctx, ctx.mntpoint, _("Too many errors; aborting.")); if (debug_tweak_on("XFS_SCRUB_FORCE_ERROR")) - str_error(&ctx, ctx.mntpoint, _("Injecting error.")); + str_info(&ctx, ctx.mntpoint, _("Injecting error.")); /* Clean up scan data. */ moveon = xfs_cleanup_fs(&ctx); |