1 files changed, 8 insertions, 13 deletions

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 6a7096422295..8d4d49b6fbf3 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -17,6 +17,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_format.h"
 #include "xfs_log.h"
 #include "xfs_trans.h"
 #include "xfs_sb.h"
@@ -32,13 +33,13 @@
 #include "xfs_inode_item.h"
 #include "xfs_btree.h"
 #include "xfs_bmap.h"
+#include "xfs_bmap_util.h"
 #include "xfs_rtalloc.h"
 #include "xfs_error.h"
 #include "xfs_itable.h"
 #include "xfs_attr.h"
 #include "xfs_buf_item.h"
 #include "xfs_trans_space.h"
-#include "xfs_utils.h"
 #include "xfs_iomap.h"
 #include "xfs_trace.h"
 #include "xfs_icache.h"
@@ -187,10 +188,8 @@ xfs_iomap_write_direct(
          * Allocate and setup the transaction
          */
         tp = xfs_trans_alloc(mp, XFS_TRANS_DIOSTRAT);
-        error = xfs_trans_reserve(tp, resblks,
-                        XFS_WRITE_LOG_RES(mp), resrtextents,
-                        XFS_TRANS_PERM_LOG_RES,
-                        XFS_WRITE_LOG_COUNT);
+        error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
+                                  resblks, resrtextents);
         /*
          * Check for running out of space, note: need lock to return
          */
@@ -698,10 +697,8 @@ xfs_iomap_write_allocate(
                         tp = xfs_trans_alloc(mp, XFS_TRANS_STRAT_WRITE);
                         tp->t_flags |= XFS_TRANS_RESERVE;
                         nres = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK);
-                        error = xfs_trans_reserve(tp, nres,
-                                        XFS_WRITE_LOG_RES(mp),
-                                        0, XFS_TRANS_PERM_LOG_RES,
-                                        XFS_WRITE_LOG_COUNT);
+                        error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
+                                                  nres, 0);
                         if (error) {
                                 xfs_trans_cancel(tp, 0);
                                 return XFS_ERROR(error);
@@ -864,10 +861,8 @@ xfs_iomap_write_unwritten(
                 sb_start_intwrite(mp->m_super);
                 tp = _xfs_trans_alloc(mp, XFS_TRANS_STRAT_WRITE, KM_NOFS);
                 tp->t_flags |= XFS_TRANS_RESERVE | XFS_TRANS_FREEZE_PROT;
-                error = xfs_trans_reserve(tp, resblks,
-                                XFS_WRITE_LOG_RES(mp), 0,
-                                XFS_TRANS_PERM_LOG_RES,
-                                XFS_WRITE_LOG_COUNT);
+                error = xfs_trans_reserve(tp, &M_RES(mp)->tr_write,
+                                          resblks, 0);
                 if (error) {
                         xfs_trans_cancel(tp, 0);
                         return XFS_ERROR(error);