xfs: mark data structures corrupt on EIO and ENODATA

I learned a few things this year: first, blk_status_to_errno can return
ENODATA for critical media errors; and second, the scrub code doesn't
mark data structures as corrupt on ENODATA or EIO.

Currently, scrub failing to capture these errors isn't all that
impactful -- the checking code will exit to userspace with EIO/ENODATA,
and xfs_scrub will log a complaint and exit with nonzero status.  Most
people treat fsck tools failing as a sign that the fs is corrupt, but
online fsck should mark the metadata bad and keep moving.

Cc: stable@vger.kernel.org # v4.15
Fixes: 4700d22980d459 ("xfs: create helpers to record and deal with scrub problems")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/scrub/btree.c b/fs/xfs/scrub/btree.c
index 8ba004979862fc11b57c0dd2dd5c2d075effd9f5..40f36db9f07d528928880913da766017b10884e6 100644 (file)
--- a/fs/xfs/scrub/btree.c
+++ b/fs/xfs/scrub/btree.c
@@ -42,6 +42,8 @@ __xchk_btree_process_error(
                break;
        case -EFSBADCRC:
        case -EFSCORRUPTED:
+       case -EIO:
+       case -ENODATA:
                /* Note the badness but don't abort. */
                sc->sm->sm_flags |= errflag;
                *error = 0;

diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
index 38d0b7d5c894bd930ab6053fee552f1694093629..affed35a8c96fd74ff9f96afdfc8db43778842df 100644 (file)
--- a/fs/xfs/scrub/common.c
+++ b/fs/xfs/scrub/common.c
@@ -103,6 +103,8 @@ __xchk_process_error(
                break;
        case -EFSBADCRC:
        case -EFSCORRUPTED:
+       case -EIO:
+       case -ENODATA:
                /* Note the badness but don't abort. */
                sc->sm->sm_flags |= errflag;
                *error = 0;
@@ -177,6 +179,8 @@ __xchk_fblock_process_error(
                break;
        case -EFSBADCRC:
        case -EFSCORRUPTED:
+       case -EIO:
+       case -ENODATA:
                /* Note the badness but don't abort. */
                sc->sm->sm_flags |= errflag;
                *error = 0;

diff --git a/fs/xfs/scrub/dabtree.c b/fs/xfs/scrub/dabtree.c
index dd14f355358ca26fcb018e8f6aa02b0057cbcbcb..5858d4d5e279b1a2d05344556c6c6301fa4de1cf 100644 (file)
--- a/fs/xfs/scrub/dabtree.c
+++ b/fs/xfs/scrub/dabtree.c
@@ -45,6 +45,8 @@ xchk_da_process_error(
                break;
        case -EFSBADCRC:
        case -EFSCORRUPTED:
+       case -EIO:
+       case -ENODATA:
                /* Note the badness but don't abort. */
                sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT;
                *error = 0;