1 files changed, 16 insertions, 17 deletions

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 046cf3d7f52f..176dbb66282d 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -226,13 +226,14 @@ xfs_attr_set_int(
         int             valuelen,
         int             flags)
 {
-        xfs_da_args_t   args;
-        xfs_fsblock_t   firstblock;
-        xfs_bmap_free_t flist;
-        int             error, err2, committed;
-        xfs_mount_t     *mp = dp->i_mount;
-        int             rsvd = (flags & ATTR_ROOT) != 0;
-        int             local;
+        xfs_da_args_t           args;
+        xfs_fsblock_t           firstblock;
+        xfs_bmap_free_t         flist;
+        int                     error, err2, committed;
+        struct xfs_mount        *mp = dp->i_mount;
+        struct xfs_trans_res    tres;
+        int                     rsvd = (flags & ATTR_ROOT) != 0;
+        int                     local;
 
         /*
          * Attach the dquots to the inode.
@@ -292,11 +293,11 @@ xfs_attr_set_int(
         if (rsvd)
                 args.trans->t_flags |= XFS_TRANS_RESERVE;
 
-        error = xfs_trans_reserve(args.trans, args.total,
-                                  XFS_ATTRSETM_LOG_RES(mp) +
-                                  XFS_ATTRSETRT_LOG_RES(mp) * args.total,
-                                  0, XFS_TRANS_PERM_LOG_RES,
-                                  XFS_ATTRSET_LOG_COUNT);
+        tres.tr_logres = M_RES(mp)->tr_attrsetm.tr_logres +
+                         M_RES(mp)->tr_attrsetrt.tr_logres * args.total;
+        tres.tr_logcount = XFS_ATTRSET_LOG_COUNT;
+        tres.tr_logflags = XFS_TRANS_PERM_LOG_RES;
+        error = xfs_trans_reserve(args.trans, &tres, args.total, 0);
         if (error) {
                 xfs_trans_cancel(args.trans, 0);
                 return(error);
@@ -516,11 +517,9 @@ xfs_attr_remove_int(xfs_inode_t *dp, struct xfs_name *name, int flags)
         if (flags & ATTR_ROOT)
                 args.trans->t_flags |= XFS_TRANS_RESERVE;
 
-        if ((error = xfs_trans_reserve(args.trans,
-                                      XFS_ATTRRM_SPACE_RES(mp),
-                                      XFS_ATTRRM_LOG_RES(mp),
-                                      0, XFS_TRANS_PERM_LOG_RES,
-                                      XFS_ATTRRM_LOG_COUNT))) {
+        error = xfs_trans_reserve(args.trans, &M_RES(mp)->tr_attrrm,
+                                  XFS_ATTRRM_SPACE_RES(mp), 0);
+        if (error) {
                 xfs_trans_cancel(args.trans, 0);
                 return(error);
         }