Commit 8aef7992 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: reuse xfs_refcount_update_cancel_item 



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

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

fs/xfs/xfs_refcount_item.c

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

}



/* Cancel a deferred refcount update. */

STATIC void

xfs_refcount_update_cancel_item(

	struct list_head		*item)

{

	struct xfs_refcount_intent	*ri = ci_entry(item);



	xfs_refcount_update_put_group(ri);

	kmem_cache_free(xfs_refcount_intent_cache, ri);

}



/* Process a deferred refcount update. */

STATIC int

xfs_refcount_update_finish_item(
@@ -354,8 +365,7 @@ xfs_refcount_update_finish_item( 
		return -EAGAIN;

	}



	xfs_refcount_update_put_group(ri);

	kmem_cache_free(xfs_refcount_intent_cache, ri);

	xfs_refcount_update_cancel_item(item);

	return error;

}
@@ -367,17 +377,6 @@ xfs_refcount_update_abort_intent( 
	xfs_cui_release(CUI_ITEM(intent));

}



/* Cancel a deferred refcount update. */

STATIC void

xfs_refcount_update_cancel_item(

	struct list_head		*item)

{

	struct xfs_refcount_intent	*ri = ci_entry(item);



	xfs_refcount_update_put_group(ri);

	kmem_cache_free(xfs_refcount_intent_cache, ri);

}



/* Is this recovered CUI ok? */

static inline bool

xfs_cui_validate_phys(