xfs: mark data structures corrupt on EIO and ENODATA

[ Upstream commit f39854a3fb2f06dc69b81ada002b641ba5b4696b ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/xfs/scrub/btree.c b/fs/xfs/scrub/btree.c
index acade92c5fce1ab0718915a69ade597f962b7dc5..b497f6a474c77855ea12f7a7668d7d2e1aa22c91 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 2ef7742be7d3da3721fcea3341190958218033a4..e6145c2eda02a5cce49ff2679ff4bfa21af3cbba 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 056de4819f866d65992d54251ee0b832ac0dd08e..a6a5d3a75d994e695a3a6e29d6a4edde49f3ece1 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;