Merge tag 'clang-features-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / xfs / xfs_trans.c

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index bcc9780..586f299 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -487,13 +487,6 @@ xfs_trans_apply_sb_deltas(
        bp = xfs_trans_getsb(tp);
        sbp = bp->b_addr;
 
-       /*
-        * Check that superblock mods match the mods made to AGF counters.
-        */
-       ASSERT((tp->t_fdblocks_delta + tp->t_res_fdblocks_delta) ==
-              (tp->t_ag_freeblks_delta + tp->t_ag_flist_delta +
-               tp->t_ag_btree_delta));
-
        /*
         * Only update the superblock counters if we are logging them
         */
@@ -629,6 +622,9 @@ xfs_trans_unreserve_and_mod_sb(
 
        /* apply remaining deltas */
        spin_lock(&mp->m_sb_lock);
+       mp->m_sb.sb_fdblocks += tp->t_fdblocks_delta + tp->t_res_fdblocks_delta;
+       mp->m_sb.sb_icount += idelta;
+       mp->m_sb.sb_ifree += ifreedelta;
        mp->m_sb.sb_frextents += rtxdelta;
        mp->m_sb.sb_dblocks += tp->t_dblocks_delta;
        mp->m_sb.sb_agcount += tp->t_agcount_delta;