]> git.hungrycats.org Git - linux/commitdiff
xfs: always report inode repair setup failures
authorDarrick J. Wong <djwong@kernel.org>
Mon, 12 Oct 2026 15:22:09 +0000 (08:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:06:02 +0000 (12:06 -0500)
commit ce9098338a7e1a77246684242d10779fc4d4a539 upstream.

LOLLM noticed that xchk_setup_inode silently discards errors being
returned by xrep_setup_inode.  Fix that, and fix the stub macro so that
it actually "returns" a value.

Cc: stable@vger.kernel.org # v6.8
Fixes: 2d295fe65776d1 ("xfs: repair inode records")
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/inode.c
fs/xfs/scrub/repair.h

index 9a7fb91996d28f79fe365e3c951839d8552a6f40..723ef494c99341bfa17d9ccb9d0c0b35b279c039 100644 (file)
@@ -212,7 +212,7 @@ xchk_setup_inode(
         * make repairs to the ondisk inode buffer.
         */
        if (xchk_could_repair(sc))
-               xrep_setup_inode(sc, &imap);
+               return xrep_setup_inode(sc, &imap);
        return 0;
 
 out_cancel:
index 2bb125c4f9bf2baca42f41852887a238ebb3f8de..1af568651e20a13107f2e7120bc43cbfd4d0502a 100644 (file)
@@ -239,7 +239,7 @@ xrep_setup_nothing(
 #define xrep_setup_rtrmapbt            xrep_setup_nothing
 #define xrep_setup_rtrefcountbt                xrep_setup_nothing
 
-#define xrep_setup_inode(sc, imap)     ((void)0)
+#define xrep_setup_inode(sc, imap)     (0)
 
 static inline int xrep_setup_symlink(struct xfs_scrub *sc, unsigned int *x)
 {