summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_trans_extfree.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2016-08-03 11:18:10 +1000
committerDave Chinner <david@fromorbit.com>2016-08-03 11:18:10 +1000
commit310a75a3c6c747857ad53dd25f2ede3de13612c9 (patch)
treef087763725df02ba37ebfa762364914b6c04bef9 /fs/xfs/xfs_trans_extfree.c
parent3ab78df2a59a485f479d26852a060acfd8c4ecd7 (diff)
downloadop-kernel-dev-310a75a3c6c747857ad53dd25f2ede3de13612c9.zip
op-kernel-dev-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_trans_extfree.c')
-rw-r--r--fs/xfs/xfs_trans_extfree.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/fs/xfs/xfs_trans_extfree.c b/fs/xfs/xfs_trans_extfree.c
index a9f34ee..b484902 100644
--- a/fs/xfs/xfs_trans_extfree.c
+++ b/fs/xfs/xfs_trans_extfree.c
@@ -35,7 +35,7 @@
* caller must use all nextents extents, because we are not
* flexible about this at all.
*/
-struct xfs_efi_log_item *
+STATIC struct xfs_efi_log_item *
xfs_trans_get_efi(struct xfs_trans *tp,
uint nextents)
{
@@ -59,7 +59,7 @@ xfs_trans_get_efi(struct xfs_trans *tp,
* extent is to be logged as needing to be freed. It should
* be called once for each extent to be freed.
*/
-void
+STATIC void
xfs_trans_log_efi_extent(struct xfs_trans *tp,
struct xfs_efi_log_item *efip,
xfs_fsblock_t start_block,
@@ -156,13 +156,13 @@ xfs_extent_free_diff_items(
struct list_head *b)
{
struct xfs_mount *mp = priv;
- struct xfs_bmap_free_item *ra;
- struct xfs_bmap_free_item *rb;
+ struct xfs_extent_free_item *ra;
+ struct xfs_extent_free_item *rb;
- ra = container_of(a, struct xfs_bmap_free_item, xbfi_list);
- rb = container_of(b, struct xfs_bmap_free_item, xbfi_list);
- return XFS_FSB_TO_AGNO(mp, ra->xbfi_startblock) -
- XFS_FSB_TO_AGNO(mp, rb->xbfi_startblock);
+ ra = container_of(a, struct xfs_extent_free_item, xefi_list);
+ rb = container_of(b, struct xfs_extent_free_item, xefi_list);
+ return XFS_FSB_TO_AGNO(mp, ra->xefi_startblock) -
+ XFS_FSB_TO_AGNO(mp, rb->xefi_startblock);
}
/* Get an EFI. */
@@ -181,11 +181,11 @@ xfs_extent_free_log_item(
void *intent,
struct list_head *item)
{
- struct xfs_bmap_free_item *free;
+ struct xfs_extent_free_item *free;
- free = container_of(item, struct xfs_bmap_free_item, xbfi_list);
- xfs_trans_log_efi_extent(tp, intent, free->xbfi_startblock,
- free->xbfi_blockcount);
+ free = container_of(item, struct xfs_extent_free_item, xefi_list);
+ xfs_trans_log_efi_extent(tp, intent, free->xefi_startblock,
+ free->xefi_blockcount);
}
/* Get an EFD so we can process all the free extents. */
@@ -207,13 +207,13 @@ xfs_extent_free_finish_item(
void *done_item,
void **state)
{
- struct xfs_bmap_free_item *free;
+ struct xfs_extent_free_item *free;
int error;
- free = container_of(item, struct xfs_bmap_free_item, xbfi_list);
+ free = container_of(item, struct xfs_extent_free_item, xefi_list);
error = xfs_trans_free_extent(tp, done_item,
- free->xbfi_startblock,
- free->xbfi_blockcount);
+ free->xefi_startblock,
+ free->xefi_blockcount);
kmem_free(free);
return error;
}
@@ -231,9 +231,9 @@ STATIC void
xfs_extent_free_cancel_item(
struct list_head *item)
{
- struct xfs_bmap_free_item *free;
+ struct xfs_extent_free_item *free;
- free = container_of(item, struct xfs_bmap_free_item, xbfi_list);
+ free = container_of(item, struct xfs_extent_free_item, xefi_list);
kmem_free(free);
}
OpenPOWER on IntegriCloud