xfs: add frextents to the lazysbcounters when rtgroups enabled

Make the free rt extent count a part of the lazy sb counters when the
realtime groups feature is enabled.  This is possible because the patch
to recompute frextents from the rtbitmap during log recovery predates
the code adding rtgroup support, hence we know that the value will
always be correct during runtime.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
index 0e0913d8ca4efb59722f351861f79cdba9673f0f..631a3dd29136613a53b8f427b1a69d78e69dcf63 100644 (file)
--- a/fs/xfs/libxfs/xfs_sb.c
+++ b/fs/xfs/libxfs/xfs_sb.c
@@ -1168,6 +1168,11 @@ xfs_log_sb(
         * sb counters, despite having a percpu counter. It is always kept
         * consistent with the ondisk rtbitmap by xfs_trans_apply_sb_deltas()
         * and hence we don't need have to update it here.
+        *
+        * sb_frextents was added to the lazy sb counters when the rt groups
+        * feature was introduced.  This counter can go negative due to the way
+        * we handle nearly-lockless reservations, so we must use the _positive
+        * variant here to avoid writing out nonsense frextents.
         */
        if (xfs_has_lazysbcount(mp)) {
                mp->m_sb.sb_icount = percpu_counter_sum_positive(&mp->m_icount);
@@ -1177,6 +1182,9 @@ xfs_log_sb(
                mp->m_sb.sb_fdblocks =
                                percpu_counter_sum_positive(&mp->m_fdblocks);
        }
+       if (xfs_has_rtgroups(mp))
+               mp->m_sb.sb_frextents =
+                               percpu_counter_sum_positive(&mp->m_frextents);
 
        xfs_sb_to_disk(bp->b_addr, &mp->m_sb);
        xfs_trans_buf_set_type(tp, bp, XFS_BLFT_SB_BUF);

diff --git a/fs/xfs/scrub/fscounters_repair.c b/fs/xfs/scrub/fscounters_repair.c
index 469bf645dbea52643a77afd138aff902f34bb207..cda13447a373e14240acbd3f33d153138e8e141e 100644 (file)
--- a/fs/xfs/scrub/fscounters_repair.c
+++ b/fs/xfs/scrub/fscounters_repair.c
@@ -68,15 +68,16 @@ xrep_fscounters(
 
        /*
         * Online repair is only supported on v5 file systems, which require
-        * lazy sb counters and thus no update of sb_fdblocks here.  But as of
-        * now we don't support lazy counting sb_frextents yet, and thus need
-        * to also update it directly here.  And for that we need to keep
+        * lazy sb counters and thus no update of sb_fdblocks here.  But
+        * sb_frextents only uses a lazy counter with rtgroups, and thus needs
+        * to be updated directly here otherwise.  And for that we need to keep
         * track of the delalloc reservations separately, as they are are
         * subtracted from m_frextents, but not included in sb_frextents.
         */
        percpu_counter_set(&mp->m_frextents,
                fsc->frextents - fsc->frextents_delayed);
-       mp->m_sb.sb_frextents = fsc->frextents;
+       if (!xfs_has_rtgroups(mp))
+               mp->m_sb.sb_frextents = fsc->frextents;
 
        return 0;
 }

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 5fd1765b3dcd8726856a288af1b2125aa4191ec0..552e3a149346cc80d91a75ec56dac512303b0b22 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -421,6 +421,8 @@ xfs_trans_mod_sb(
                        ASSERT(tp->t_rtx_res_used <= tp->t_rtx_res);
                }
                tp->t_frextents_delta += delta;
+               if (xfs_has_rtgroups(mp))
+                       flags &= ~XFS_TRANS_SB_DIRTY;
                break;
        case XFS_TRANS_SB_RES_FREXTENTS:
                /*
@@ -510,8 +512,14 @@ xfs_trans_apply_sb_deltas(
         *
         * Don't touch m_frextents because it includes incore reservations,
         * and those are handled by the unreserve function.
+        *
+        * sb_frextents was added to the lazy sb counters when the rt groups
+        * feature was introduced.  This is possible because we know that all
+        * kernels supporting rtgroups will also recompute frextents from the
+        * realtime bitmap.
         */
-       if (tp->t_frextents_delta || tp->t_res_frextents_delta) {
+       if ((tp->t_frextents_delta || tp->t_res_frextents_delta) &&
+           !xfs_has_rtgroups(tp->t_mountp)) {
                struct xfs_mount        *mp = tp->t_mountp;
                int64_t                 rtxdelta;
 
@@ -619,7 +627,7 @@ xfs_trans_unreserve_and_mod_sb(
        }
 
        ASSERT(tp->t_rtx_res || tp->t_frextents_delta >= 0);
-       if (tp->t_flags & XFS_TRANS_SB_DIRTY) {
+       if (xfs_has_rtgroups(mp) || (tp->t_flags & XFS_TRANS_SB_DIRTY)) {
                rtxdelta += tp->t_frextents_delta;
                ASSERT(rtxdelta >= 0);
        }
@@ -655,8 +663,11 @@ xfs_trans_unreserve_and_mod_sb(
         * Do not touch sb_frextents here because we are dealing with incore
         * reservation.  sb_frextents is not part of the lazy sb counters so it
         * must be consistent with the ondisk rtbitmap and must never include
-        * incore reservations.
+        * incore reservations.  sb_frextents was added to the lazy sb counters
+        * when the realtime groups feature was introduced.
         */
+       if (xfs_has_rtgroups(mp))
+               mp->m_sb.sb_frextents += rtxdelta;
        mp->m_sb.sb_dblocks += tp->t_dblocks_delta;
        mp->m_sb.sb_agcount += tp->t_agcount_delta;
        mp->m_sb.sb_imax_pct += tp->t_imaxpct_delta;