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

xfs: move ->iop_relog to struct xfs_defer_op_type 



The only log items that need relogging are the ones created for deferred
work operations, and the only part of the code base that relogs log
items is the deferred work machinery.  Move the function pointers.

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

fs/xfs/libxfs/xfs_defer.c

+20 −11
Original line number Diff line number Diff line
@@ -459,6 +459,25 @@ xfs_defer_cancel_list( 
		xfs_defer_pending_cancel_work(mp, dfp);

}



static inline void

xfs_defer_relog_intent(

	struct xfs_trans		*tp,

	struct xfs_defer_pending	*dfp)

{

	struct xfs_log_item		*lip;

	const struct xfs_defer_op_type	*ops = defer_op_types[dfp->dfp_type];



	xfs_defer_create_done(tp, dfp);



	lip = ops->relog_intent(tp, dfp->dfp_intent, dfp->dfp_done);

	if (lip) {

		xfs_trans_add_item(tp, lip);

		set_bit(XFS_LI_DIRTY, &lip->li_flags);

	}

	dfp->dfp_done = NULL;

	dfp->dfp_intent = lip;

}



/*

 * Prevent a log intent item from pinning the tail of the log by logging a

 * done item to release the intent item; and then log a new intent item.
@@ -477,8 +496,6 @@ xfs_defer_relog( 
	ASSERT((*tpp)->t_flags & XFS_TRANS_PERM_LOG_RES);



	list_for_each_entry(dfp, dfops, dfp_list) {

		struct xfs_log_item	*lip;



		/*

		 * If the log intent item for this deferred op is not a part of

		 * the current log checkpoint, relog the intent item to keep
@@ -506,15 +523,7 @@ xfs_defer_relog( 
		trace_xfs_defer_relog_intent((*tpp)->t_mountp, dfp);

		XFS_STATS_INC((*tpp)->t_mountp, defer_relog);



		xfs_defer_create_done(*tpp, dfp);

		lip = xfs_trans_item_relog(dfp->dfp_intent, dfp->dfp_done,

				*tpp);

		if (lip) {

			xfs_trans_add_item(*tpp, lip);

			set_bit(XFS_LI_DIRTY, &lip->li_flags);

		}

		dfp->dfp_done = NULL;

		dfp->dfp_intent = lip;

		xfs_defer_relog_intent(*tpp, dfp);

	}



	if ((*tpp)->t_flags & XFS_TRANS_DIRTY)

fs/xfs/libxfs/xfs_defer.h

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ struct xfs_defer_op_type { 
	void (*cancel_item)(struct list_head *item);

	int (*recover_work)(struct xfs_defer_pending *dfp,

			    struct list_head *capture_list);

	struct xfs_log_item *(*relog_intent)(struct xfs_trans *tp,

			struct xfs_log_item *intent,

			struct xfs_log_item *done_item);

	unsigned int		max_items;

};

fs/xfs/xfs_attr_item.c

+4 −4
Original line number Diff line number Diff line
@@ -625,10 +625,10 @@ xfs_attr_recover_work( 


/* Re-log an intent item to push the log tail forward. */

static struct xfs_log_item *

xfs_attri_item_relog(

xfs_attr_relog_intent(

	struct xfs_trans		*tp,

	struct xfs_log_item		*intent,

	struct xfs_log_item		*done_item,

	struct xfs_trans		*tp)

	struct xfs_log_item		*done_item)

{

	struct xfs_attri_log_item	*old_attrip;

	struct xfs_attri_log_item	*new_attrip;
@@ -763,6 +763,7 @@ const struct xfs_defer_op_type xfs_attr_defer_type = { 
	.finish_item	= xfs_attr_finish_item,

	.cancel_item	= xfs_attr_cancel_item,

	.recover_work	= xfs_attr_recover_work,

	.relog_intent	= xfs_attr_relog_intent,

};



/*
@@ -800,7 +801,6 @@ static const struct xfs_item_ops xfs_attri_item_ops = { 
	.iop_unpin	= xfs_attri_item_unpin,

	.iop_release    = xfs_attri_item_release,

	.iop_match	= xfs_attri_item_match,

	.iop_relog	= xfs_attri_item_relog,

};



const struct xlog_recover_item_ops xlog_attri_item_ops = {

fs/xfs/xfs_bmap_item.c

+22 −22
Original line number Diff line number Diff line
@@ -541,30 +541,12 @@ xfs_bmap_recover_work( 
	return error;

}



const struct xfs_defer_op_type xfs_bmap_update_defer_type = {

	.max_items	= XFS_BUI_MAX_FAST_EXTENTS,

	.create_intent	= xfs_bmap_update_create_intent,

	.abort_intent	= xfs_bmap_update_abort_intent,

	.create_done	= xfs_bmap_update_create_done,

	.finish_item	= xfs_bmap_update_finish_item,

	.cancel_item	= xfs_bmap_update_cancel_item,

	.recover_work	= xfs_bmap_recover_work,

};



STATIC bool

xfs_bui_item_match(

	struct xfs_log_item	*lip,

	uint64_t		intent_id)

{

	return BUI_ITEM(lip)->bui_format.bui_id == intent_id;

}



/* Relog an intent item to push the log tail forward. */

static struct xfs_log_item *

xfs_bui_item_relog(

xfs_bmap_relog_intent(

	struct xfs_trans		*tp,

	struct xfs_log_item		*intent,

	struct xfs_log_item		*done_item,

	struct xfs_trans		*tp)

	struct xfs_log_item		*done_item)

{

	struct xfs_bui_log_item		*buip;

	struct xfs_map_extent		*map;
@@ -580,6 +562,25 @@ xfs_bui_item_relog( 
	return &buip->bui_item;

}



const struct xfs_defer_op_type xfs_bmap_update_defer_type = {

	.max_items	= XFS_BUI_MAX_FAST_EXTENTS,

	.create_intent	= xfs_bmap_update_create_intent,

	.abort_intent	= xfs_bmap_update_abort_intent,

	.create_done	= xfs_bmap_update_create_done,

	.finish_item	= xfs_bmap_update_finish_item,

	.cancel_item	= xfs_bmap_update_cancel_item,

	.recover_work	= xfs_bmap_recover_work,

	.relog_intent	= xfs_bmap_relog_intent,

};



STATIC bool

xfs_bui_item_match(

	struct xfs_log_item	*lip,

	uint64_t		intent_id)

{

	return BUI_ITEM(lip)->bui_format.bui_id == intent_id;

}



static const struct xfs_item_ops xfs_bui_item_ops = {

	.flags		= XFS_ITEM_INTENT,

	.iop_size	= xfs_bui_item_size,
@@ -587,7 +588,6 @@ static const struct xfs_item_ops xfs_bui_item_ops = { 
	.iop_unpin	= xfs_bui_item_unpin,

	.iop_release	= xfs_bui_item_release,

	.iop_match	= xfs_bui_item_match,

	.iop_relog	= xfs_bui_item_relog,

};



static inline void

fs/xfs/xfs_extfree_item.c

+27 −26
Original line number Diff line number Diff line
@@ -643,6 +643,31 @@ xfs_extent_free_recover_work( 
	return error;

}



/* Relog an intent item to push the log tail forward. */

static struct xfs_log_item *

xfs_extent_free_relog_intent(

	struct xfs_trans		*tp,

	struct xfs_log_item		*intent,

	struct xfs_log_item		*done_item)

{

	struct xfs_efd_log_item		*efdp = EFD_ITEM(done_item);

	struct xfs_efi_log_item		*efip;

	struct xfs_extent		*extp;

	unsigned int			count;



	count = EFI_ITEM(intent)->efi_format.efi_nextents;

	extp = EFI_ITEM(intent)->efi_format.efi_extents;



	efdp->efd_next_extent = count;

	memcpy(efdp->efd_format.efd_extents, extp, count * sizeof(*extp));



	efip = xfs_efi_init(tp->t_mountp, count);

	memcpy(efip->efi_format.efi_extents, extp, count * sizeof(*extp));

	atomic_set(&efip->efi_next_extent, count);



	return &efip->efi_item;

}



const struct xfs_defer_op_type xfs_extent_free_defer_type = {

	.max_items	= XFS_EFI_MAX_FAST_EXTENTS,

	.create_intent	= xfs_extent_free_create_intent,
@@ -651,6 +676,7 @@ const struct xfs_defer_op_type xfs_extent_free_defer_type = { 
	.finish_item	= xfs_extent_free_finish_item,

	.cancel_item	= xfs_extent_free_cancel_item,

	.recover_work	= xfs_extent_free_recover_work,

	.relog_intent	= xfs_extent_free_relog_intent,

};



/* sub-type with special handling for AGFL deferred frees */
@@ -662,6 +688,7 @@ const struct xfs_defer_op_type xfs_agfl_free_defer_type = { 
	.finish_item	= xfs_agfl_free_finish_item,

	.cancel_item	= xfs_extent_free_cancel_item,

	.recover_work	= xfs_extent_free_recover_work,

	.relog_intent	= xfs_extent_free_relog_intent,

};



STATIC bool
@@ -672,31 +699,6 @@ xfs_efi_item_match( 
	return EFI_ITEM(lip)->efi_format.efi_id == intent_id;

}



/* Relog an intent item to push the log tail forward. */

static struct xfs_log_item *

xfs_efi_item_relog(

	struct xfs_log_item		*intent,

	struct xfs_log_item		*done_item,

	struct xfs_trans		*tp)

{

	struct xfs_efd_log_item		*efdp = EFD_ITEM(done_item);

	struct xfs_efi_log_item		*efip;

	struct xfs_extent		*extp;

	unsigned int			count;



	count = EFI_ITEM(intent)->efi_format.efi_nextents;

	extp = EFI_ITEM(intent)->efi_format.efi_extents;



	efdp->efd_next_extent = count;

	memcpy(efdp->efd_format.efd_extents, extp, count * sizeof(*extp));



	efip = xfs_efi_init(tp->t_mountp, count);

	memcpy(efip->efi_format.efi_extents, extp, count * sizeof(*extp));

	atomic_set(&efip->efi_next_extent, count);



	return &efip->efi_item;

}



static const struct xfs_item_ops xfs_efi_item_ops = {

	.flags		= XFS_ITEM_INTENT,

	.iop_size	= xfs_efi_item_size,
@@ -704,7 +706,6 @@ static const struct xfs_item_ops xfs_efi_item_ops = { 
	.iop_unpin	= xfs_efi_item_unpin,

	.iop_release	= xfs_efi_item_release,

	.iop_match	= xfs_efi_item_match,

	.iop_relog	= xfs_efi_item_relog,

};



/*