1 files changed, 7 insertions, 5 deletions

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 5fde1654b430..cd1008b1c4cd 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -249,8 +249,9 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name,
         /*
          * Attach the dquots to the inode.
          */
-        if ((error = XFS_QM_DQATTACH(mp, dp, 0)))
-                return (error);
+        error = xfs_qm_dqattach(dp, 0);
+        if (error)
+                return error;
 
         /*
          * If the inode doesn't have an attribute fork, add one.
@@ -311,7 +312,7 @@ xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name,
         }
         xfs_ilock(dp, XFS_ILOCK_EXCL);
 
-        error = XFS_TRANS_RESERVE_QUOTA_NBLKS(mp, args.trans, dp, args.total, 0,
+        error = xfs_trans_reserve_quota_nblks(args.trans, dp, args.total, 0,
                                 rsvd ? XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES :
                                        XFS_QMOPT_RES_REGBLKS);
         if (error) {
@@ -501,8 +502,9 @@ xfs_attr_remove_int(xfs_inode_t *dp, struct xfs_name *name, int flags)
         /*
          * Attach the dquots to the inode.
          */
-        if ((error = XFS_QM_DQATTACH(mp, dp, 0)))
-                return (error);
+        error = xfs_qm_dqattach(dp, 0);
+        if (error)
+                return error;
 
         /*
          * Start our first transaction of the day.