7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Darrick J. Wong 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 Assisted-by: LOLLM # finding obvious bugs Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino Signed-off-by: Greg Kroah-Hartman --- fs/xfs/scrub/inode.c | 2 +- fs/xfs/scrub/repair.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/fs/xfs/scrub/inode.c +++ b/fs/xfs/scrub/inode.c @@ -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: --- a/fs/xfs/scrub/repair.h +++ b/fs/xfs/scrub/repair.h @@ -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) {