Commit 61665fae authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: reuse xfs_extent_free_cancel_item 



Reuse xfs_extent_free_cancel_item to put the AG/RTG and free the item in
a few places that currently open code the logic.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 649c0c2b

fs/xfs/xfs_extfree_item.c

+13 −15
Original line number Diff line number Diff line
@@ -437,6 +437,17 @@ xfs_extent_free_put_group( 
	xfs_perag_intent_put(xefi->xefi_pag);

}



/* Cancel a free extent. */

STATIC void

xfs_extent_free_cancel_item(

	struct list_head		*item)

{

	struct xfs_extent_free_item	*xefi = xefi_entry(item);



	xfs_extent_free_put_group(xefi);

	kmem_cache_free(xfs_extfree_item_cache, xefi);

}



/* Process a free extent. */

STATIC int

xfs_extent_free_finish_item(
@@ -487,8 +498,7 @@ xfs_extent_free_finish_item( 
	extp->ext_len = xefi->xefi_blockcount;

	efdp->efd_next_extent++;



	xfs_extent_free_put_group(xefi);

	kmem_cache_free(xfs_extfree_item_cache, xefi);

	xfs_extent_free_cancel_item(item);

	return error;

}
@@ -500,17 +510,6 @@ xfs_extent_free_abort_intent( 
	xfs_efi_release(EFI_ITEM(intent));

}



/* Cancel a free extent. */

STATIC void

xfs_extent_free_cancel_item(

	struct list_head		*item)

{

	struct xfs_extent_free_item	*xefi = xefi_entry(item);



	xfs_extent_free_put_group(xefi);

	kmem_cache_free(xfs_extfree_item_cache, xefi);

}



/*

 * AGFL blocks are accounted differently in the reserve pools and are not

 * inserted into the busy extent list.
@@ -550,8 +549,7 @@ xfs_agfl_free_finish_item( 
	extp->ext_len = xefi->xefi_blockcount;

	efdp->efd_next_extent++;



	xfs_extent_free_put_group(xefi);

	kmem_cache_free(xfs_extfree_item_cache, xefi);

	xfs_extent_free_cancel_item(&xefi->xefi_list);

	return error;

}