diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-08-03 11:18:10 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-08-03 11:18:10 +1000 |
| commit | 310a75a3c6c747857ad53dd25f2ede3de13612c9 (patch) | |
| tree | f087763725df02ba37ebfa762364914b6c04bef9 /fs/xfs/xfs_dquot.c | |
| parent | 3ab78df2a59a485f479d26852a060acfd8c4ecd7 (diff) | |
| download | linux-310a75a3c6c747857ad53dd25f2ede3de13612c9.tar.gz | |
xfs: change xfs_bmap_{finish,cancel,init,free} -> xfs_defer_*
Drop the compatibility shims that we were using to integrate the new
deferred operation mechanism into the existing code. No new code.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_dquot.c')
| -rw-r--r-- | fs/xfs/xfs_dquot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index 3615f806cec9..d9447f1bf483 100644 --- 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); |