xfs: clean up quota reservation callsites

Convert a few xfs_trans_*reserve* callsites that are open-coding other
convenience functions.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 7ea1dbbe3d0b5ad14df5ec4387bf8449b3b5f0f1..c730288b5981a53c1e49f5a3e19cb0cf8baa9aff 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4937,8 +4937,7 @@ xfs_bmap_del_extent_delay(
         * sb counters as we might have to borrow some blocks for the
         * indirect block accounting.
         */
-       error = xfs_trans_reserve_quota_nblks(NULL, ip,
-                       -((long)del->br_blockcount), 0,
+       error = xfs_trans_unreserve_quota_nblks(NULL, ip, del->br_blockcount, 0,
                        isrt ? XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS);
        if (error)
                return error;

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index f3f8c48ff5bf107514d2ddc0a8668808ed2d12ff..792809debaaa7e4776b0b66df727970bed59e8c3 100644 (file)
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -884,8 +884,8 @@ xfs_unmap_extent(
        }
 
        xfs_ilock(ip, XFS_ILOCK_EXCL);
-       error = xfs_trans_reserve_quota(tp, mp, ip->i_udquot, ip->i_gdquot,
-                       ip->i_pdquot, resblks, 0, XFS_QMOPT_RES_REGBLKS);
+       error = xfs_trans_reserve_quota_nblks(tp, ip, resblks, 0,
+                       XFS_QMOPT_RES_REGBLKS);
        if (error)
                goto out_trans_cancel;
 

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index e1c98dbf79e49eabbf89eeb76afcd752bf1dc95c..183142fd0961e7d02e24a8dddbcfed09acee64a8 100644 (file)
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -508,8 +508,8 @@ xfs_reflink_cancel_cow_blocks(
                        xfs_bmap_del_extent_cow(ip, &icur, &got, &del);
 
                        /* Remove the quota reservation */
-                       error = xfs_trans_reserve_quota_nblks(NULL, ip,
-                                       -(long)del.br_blockcount, 0,
+                       error = xfs_trans_unreserve_quota_nblks(NULL, ip,
+                                       del.br_blockcount, 0,
                                        XFS_QMOPT_RES_REGBLKS);
                        if (error)
                                break;