Commit 37f9d1db authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: reuse xfs_rmap_update_cancel_item 



Reuse xfs_rmap_update_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 f9396377

fs/xfs/xfs_rmap_item.c

+12 −13
Original line number Diff line number Diff line
@@ -358,6 +358,17 @@ xfs_rmap_update_put_group( 
	xfs_perag_intent_put(ri->ri_pag);

}



/* Cancel a deferred rmap update. */

STATIC void

xfs_rmap_update_cancel_item(

	struct list_head		*item)

{

	struct xfs_rmap_intent		*ri = ri_entry(item);



	xfs_rmap_update_put_group(ri);

	kmem_cache_free(xfs_rmap_intent_cache, ri);

}



/* Process a deferred rmap update. */

STATIC int

xfs_rmap_update_finish_item(
@@ -371,8 +382,7 @@ xfs_rmap_update_finish_item( 


	error = xfs_rmap_finish_one(tp, ri, state);



	xfs_rmap_update_put_group(ri);

	kmem_cache_free(xfs_rmap_intent_cache, ri);

	xfs_rmap_update_cancel_item(item);

	return error;

}
@@ -384,17 +394,6 @@ xfs_rmap_update_abort_intent( 
	xfs_rui_release(RUI_ITEM(intent));

}



/* Cancel a deferred rmap update. */

STATIC void

xfs_rmap_update_cancel_item(

	struct list_head		*item)

{

	struct xfs_rmap_intent		*ri = ri_entry(item);



	xfs_rmap_update_put_group(ri);

	kmem_cache_free(xfs_rmap_intent_cache, ri);

}



/* Is this recovered RUI ok? */

static inline bool

xfs_rui_validate_map(