xfs: calculate RT bitmap and summary blocks based on sb_rextents

Use the on-disk rextents to calculate the bitmap and summary blocks
instead of the calculated one so that we can refactor the helpers for
calculating them.

As the RT bitmap and summary scrubbers already check that sb_rextents
match the block count this does not change coverage of the scrubber.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/scrub/rtbitmap.c b/fs/xfs/scrub/rtbitmap.c
index 7df7f4facc14fd7e6a057423e25a848033240c68..5e1fb4dab0954ef7e0e309846655aca1a32712df 100644 (file)
--- a/fs/xfs/scrub/rtbitmap.c
+++ b/fs/xfs/scrub/rtbitmap.c
@@ -67,7 +67,8 @@ xchk_setup_rtbitmap(
        if (mp->m_sb.sb_rblocks) {
                rtb->rextents = xfs_rtb_to_rtx(mp, mp->m_sb.sb_rblocks);
                rtb->rextslog = xfs_compute_rextslog(rtb->rextents);
-               rtb->rbmblocks = xfs_rtbitmap_blockcount(mp, rtb->rextents);
+               rtb->rbmblocks = xfs_rtbitmap_blockcount(mp,
+                               mp->m_sb.sb_rextents);
        }
 
        return 0;

diff --git a/fs/xfs/scrub/rtsummary.c b/fs/xfs/scrub/rtsummary.c
index cc532aaf174ff37fd585ef934fc392ad2f39f7ca..08e82fa4945f9664f380bc749448d23ee24d3d0c 100644 (file)
--- a/fs/xfs/scrub/rtsummary.c
+++ b/fs/xfs/scrub/rtsummary.c
@@ -105,9 +105,10 @@ xchk_setup_rtsummary(
                int             rextslog;
 
                rts->rextents = xfs_rtb_to_rtx(mp, mp->m_sb.sb_rblocks);
-               rextslog = xfs_compute_rextslog(rts->rextents);
+               rextslog = xfs_compute_rextslog(mp->m_sb.sb_rextents);
                rts->rsumlevels = rextslog + 1;
-               rts->rbmblocks = xfs_rtbitmap_blockcount(mp, rts->rextents);
+               rts->rbmblocks = xfs_rtbitmap_blockcount(mp,
+                               mp->m_sb.sb_rextents);
                rts->rsumblocks = xfs_rtsummary_blockcount(mp, rts->rsumlevels,
                                rts->rbmblocks);
        }