1 files changed, 6 insertions, 10 deletions

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 68680ce67547..e99f5e552c64 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -173,7 +173,7 @@ xfs_trans_reserve(
         uint                    rtextents)
 {
         int             error = 0;
-        int             rsvd = (tp->t_flags & XFS_TRANS_RESERVE) != 0;
+        bool            rsvd = (tp->t_flags & XFS_TRANS_RESERVE) != 0;
 
         /* Mark this thread as being in a transaction */
         current_set_flags_nested(&tp->t_pflags, PF_FSTRANS);
@@ -184,8 +184,7 @@ xfs_trans_reserve(
          * fail if the count would go below zero.
          */
         if (blocks > 0) {
-                error = xfs_icsb_modify_counters(tp->t_mountp, XFS_SBS_FDBLOCKS,
-                                          -((int64_t)blocks), rsvd);
+                error = xfs_mod_fdblocks(tp->t_mountp, -((int64_t)blocks), rsvd);
                 if (error != 0) {
                         current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
                         return -ENOSPC;
@@ -268,8 +267,7 @@ undo_log:
 
 undo_blocks:
         if (blocks > 0) {
-                xfs_icsb_modify_counters(tp->t_mountp, XFS_SBS_FDBLOCKS,
-                                         (int64_t)blocks, rsvd);
+                xfs_mod_fdblocks(tp->t_mountp, -((int64_t)blocks), rsvd);
                 tp->t_blk_res = 0;
         }
 
@@ -516,14 +514,13 @@ xfs_trans_unreserve_and_mod_sb(
         xfs_mount_t     *mp = tp->t_mountp;
         /* REFERENCED */
         int             error;
-        int             rsvd;
+        bool            rsvd = (tp->t_flags & XFS_TRANS_RESERVE) != 0;
         int64_t         blkdelta = 0;
         int64_t         rtxdelta = 0;
         int64_t         idelta = 0;
         int64_t         ifreedelta = 0;
 
         msbp = msb;
-        rsvd = (tp->t_flags & XFS_TRANS_RESERVE) != 0;
 
         /* calculate deltas */
         if (tp->t_blk_res > 0)
@@ -547,8 +544,7 @@ xfs_trans_unreserve_and_mod_sb(
 
         /* apply the per-cpu counters */
         if (blkdelta) {
-                error = xfs_icsb_modify_counters(mp, XFS_SBS_FDBLOCKS,
-                                                 blkdelta, rsvd);
+                error = xfs_mod_fdblocks(mp, blkdelta, rsvd);
                 if (error)
                         goto out;
         }
@@ -635,7 +631,7 @@ out_undo_icount:
                 xfs_mod_icount(mp, -idelta);
 out_undo_fdblocks:
         if (blkdelta)
-                xfs_icsb_modify_counters(mp, XFS_SBS_FDBLOCKS, -blkdelta, rsvd);
+                xfs_mod_fdblocks(mp, -blkdelta, rsvd);
 out:
         ASSERT(error == 0);
         return;