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, 4 insertions, 4 deletions

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 614eb0cc3608..e64ee5288b86 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -203,8 +203,9 @@ xfs_growfs_data_private(
 
         tp = xfs_trans_alloc(mp, XFS_TRANS_GROWFS);
         tp->t_flags |= XFS_TRANS_RESERVE;
-        if ((error = xfs_trans_reserve(tp, XFS_GROWFS_SPACE_RES(mp),
-                        XFS_GROWDATA_LOG_RES(mp), 0, 0, 0))) {
+        error = xfs_trans_reserve(tp, &M_RES(mp)->tr_growdata,
+                                  XFS_GROWFS_SPACE_RES(mp), 0);
+        if (error) {
                 xfs_trans_cancel(tp, 0);
                 return error;
         }
@@ -739,8 +740,7 @@ xfs_fs_log_dummy(
         int             error;
 
         tp = _xfs_trans_alloc(mp, XFS_TRANS_DUMMY1, KM_SLEEP);
-        error = xfs_trans_reserve(tp, 0, XFS_SB_LOG_RES(mp), 0, 0,
-                                  XFS_DEFAULT_LOG_COUNT);
+        error = xfs_trans_reserve(tp, &M_RES(mp)->tr_sb, 0, 0);
         if (error) {
                 xfs_trans_cancel(tp, 0);
                 return error;