xfs: refactor xfs_trans_reserve() interface

With the new xfs_trans_res structure has been introduced, the log
reservation size, log count as well as log flags are pre-initialized
at mount time.  So it's time to refine xfs_trans_reserve() interface
to be more neat.

Also, introduce a new helper M_RES() to return a pointer to the
mp->m_resv structure to simplify the input.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index cf8f74407660..8d4d49b6fbf3 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -188,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
          */
@@ -699,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);
@@ -865,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);