xfs: change xfs_bmap_{finish,cancel,init,free} -> xfs_defer_*

[linux-2.6-block.git] / fs / xfs / xfs_dquot.c

diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 3615f806cec9f36c5283757d79de7aab1b51dd70..d9447f1bf483fdc817282176454686139a4c1c1b 100644 (file)
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -308,7 +308,7 @@ xfs_qm_dqalloc(
        xfs_buf_t       **O_bpp)
 {
        xfs_fsblock_t   firstblock;
-       xfs_bmap_free_t flist;
+       struct xfs_defer_ops flist;
        xfs_bmbt_irec_t map;
        int             nmaps, error;
        xfs_buf_t       *bp;
@@ -321,7 +321,7 @@ xfs_qm_dqalloc(
        /*
         * Initialize the bmap freelist prior to calling bmapi code.
         */
-       xfs_bmap_init(&flist, &firstblock);
+       xfs_defer_init(&flist, &firstblock);
        xfs_ilock(quotip, XFS_ILOCK_EXCL);
        /*
         * Return if this type of quotas is turned off while we didn't
@@ -369,7 +369,7 @@ xfs_qm_dqalloc(
                              dqp->dq_flags & XFS_DQ_ALLTYPES, bp);
 
        /*
-        * xfs_bmap_finish() may commit the current transaction and
+        * xfs_defer_finish() may commit the current transaction and
         * start a second transaction if the freelist is not empty.
         *
         * Since we still want to modify this buffer, we need to
@@ -383,7 +383,7 @@ xfs_qm_dqalloc(
 
        xfs_trans_bhold(tp, bp);
 
-       error = xfs_bmap_finish(tpp, &flist, NULL);
+       error = xfs_defer_finish(tpp, &flist, NULL);
        if (error)
                goto error1;
 
@@ -399,7 +399,7 @@ xfs_qm_dqalloc(
        return 0;
 
 error1:
-       xfs_bmap_cancel(&flist);
+       xfs_defer_cancel(&flist);
 error0:
        xfs_iunlock(quotip, XFS_ILOCK_EXCL);