]> git.hungrycats.org Git - linux/commitdiff
xfs: don't try to repair rtsummary if the summary file isn't computed
authorDarrick J. Wong <djwong@kernel.org>
Tue, 13 Oct 2026 06:09:22 +0000 (23:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:06:03 +0000 (12:06 -0500)
commit 6e82b7641889ad0198f3bf17a5e4c6fe7aab0850 upstream.

LOLLM observed that we can erroneously try to repair the rtsummary file
if we've not yet computed its contents.  That results in a corrupt
summary file, so let's add a flag to track whether or not the incore
data is complete.

Cc: stable@vger.kernel.org # v6.10
Fixes: abf039e2e4afde ("xfs: online repair of realtime summaries")
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/rtsummary.c
fs/xfs/scrub/rtsummary.h
fs/xfs/scrub/rtsummary_repair.c

index 8fb06ce4a2003639de30303dd28122e93cd428ef..c090c8ae30dfb79d4c46ee6cd0494cb673d8e90a 100644 (file)
@@ -213,13 +213,20 @@ xchk_rtsum_compute(
 {
        struct xfs_mount        *mp = sc->mp;
        struct xfs_rtgroup      *rtg = sc->sr.rtg;
+       struct xchk_rtsummary   *rts = sc->buf;
+       int                     error;
 
        /* If the bitmap size doesn't match the computed size, bail. */
        if (XFS_FSB_TO_B(mp, xfs_rtbitmap_blockcount(mp)) !=
            rtg_bitmap(rtg)->i_disk_size)
                return -EFSCORRUPTED;
 
-       return xfs_rtalloc_query_all(rtg, sc->tp, xchk_rtsum_record_free, sc);
+       error = xfs_rtalloc_query_all(rtg, sc->tp, xchk_rtsum_record_free, sc);
+       if (error)
+               return error;
+
+       rts->summary_computed = true;
+       return 0;
 }
 
 /* Compare the rtsummary file against the one we computed. */
index e44b04cb6e2d5e37479eb89b8991935715202e74..af1ab64c3f21254d3ea2350b3f3a659572ca4f3a 100644 (file)
@@ -17,6 +17,7 @@ struct xchk_rtsummary {
        xfs_filblks_t           rsumblocks;
        unsigned int            rsumlevels;
        unsigned int            resblks;
+       bool                    summary_computed;
 
        /* suminfo position of xfile as we write buffers to disk. */
        xfs_rtsumoff_t          prep_wordoff;
index c94e485a8837d7094eb673fb52e6dc61792fe0e3..d6f56f3450ad182383ffbc3721a101857eb9daa2 100644 (file)
@@ -122,7 +122,7 @@ xrep_rtsummary(
                return -EOPNOTSUPP;
 
        /* Walk away if we disagree on the size of the rt bitmap. */
-       if (rts->rbmblocks != mp->m_sb.sb_rbmblocks)
+       if (rts->rbmblocks != mp->m_sb.sb_rbmblocks || !rts->summary_computed)
                return 0;
 
        /* Make sure any problems with the fork are fixed. */