]> git.hungrycats.org Git - linux/commitdiff
xfs: always report scrub errors in tracepoints
authorDarrick J. Wong <djwong@kernel.org>
Tue, 13 Oct 2026 06:08:04 +0000 (23:08 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:06:02 +0000 (12:06 -0500)
commit 1ccc8f553d885d49c1bfe141ea1f331511940b3a upstream.

LOLLM complains that the error processing functions in scrub will
sometimes zero out *error before recording a tracepoint.  This makes
diagnosing problems harder, so let's fix that.

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>
Assisted-by: LOLLM # finding obvious bugs
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/xfs/scrub/btree.c
fs/xfs/scrub/common.c
fs/xfs/scrub/dabtree.c

index b497f6a474c77855ea12f7a7668d7d2e1aa22c91..e926e338e800915e6846d71ea17805e3d860f1a9 100644 (file)
@@ -46,8 +46,14 @@ __xchk_btree_process_error(
        case -ENODATA:
                /* Note the badness but don't abort. */
                sc->sm->sm_flags |= errflag;
+               if (cur->bc_ops->type == XFS_BTREE_TYPE_INODE)
+                       trace_xchk_ifork_btree_op_error(sc, cur, level,
+                                       *error, ret_ip);
+               else
+                       trace_xchk_btree_op_error(sc, cur, level,
+                                       *error, ret_ip);
                *error = 0;
-               fallthrough;
+               break;
        default:
                if (cur->bc_ops->type == XFS_BTREE_TYPE_INODE)
                        trace_xchk_ifork_btree_op_error(sc, cur, level,
index ecbf965ad68975a0caf50f2bcce0d099f19364f7..92371a09dfc39f05897bc7c75d4e232ccf3203fb 100644 (file)
@@ -107,8 +107,9 @@ __xchk_process_error(
        case -ENODATA:
                /* Note the badness but don't abort. */
                sc->sm->sm_flags |= errflag;
+               trace_xchk_op_error(sc, agno, bno, *error, ret_ip);
                *error = 0;
-               fallthrough;
+               break;
        default:
                trace_xchk_op_error(sc, agno, bno, *error, ret_ip);
                break;
@@ -183,8 +184,10 @@ __xchk_fblock_process_error(
        case -ENODATA:
                /* Note the badness but don't abort. */
                sc->sm->sm_flags |= errflag;
+               trace_xchk_file_op_error(sc, whichfork, offset, *error,
+                               ret_ip);
                *error = 0;
-               fallthrough;
+               break;
        default:
                trace_xchk_file_op_error(sc, whichfork, offset, *error,
                                ret_ip);
index 52ff4c4b6588ea6ad5945513e026a4052db98111..3ef92483a49e4528f9c916d9520937b50d2b9f43 100644 (file)
@@ -49,8 +49,12 @@ xchk_da_process_error(
        case -ENODATA:
                /* Note the badness but don't abort. */
                sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT;
+               trace_xchk_file_op_error(sc, ds->dargs.whichfork,
+                               xfs_dir2_da_to_db(ds->dargs.geo,
+                                       ds->state->path.blk[level].blkno),
+                               *error, __return_address);
                *error = 0;
-               fallthrough;
+               break;
        default:
                trace_xchk_file_op_error(sc, ds->dargs.whichfork,
                                xfs_dir2_da_to_db(ds->dargs.geo,