Commit 7f2f7531 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chandan Babu R
Browse files

xfs: store an ops pointer in struct xfs_defer_pending 



The dfp_type field in struct xfs_defer_pending is only used to either
look up the operations associated with the pending word or in trace
points.  Replace it with a direct pointer to the operations vector,
and store a pretty name in the vector for tracing.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 2e8f7b6f

fs/xfs/libxfs/xfs_defer.c

+17 −26
Original line number Diff line number Diff line
@@ -251,7 +251,6 @@ xfs_defer_create_done( 
	struct xfs_trans		*tp,

	struct xfs_defer_pending	*dfp)

{

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

	struct xfs_log_item		*lip;



	/* If there is no log intent item, there can be no log done item. */
@@ -266,7 +265,7 @@ xfs_defer_create_done( 
	 * 2.) shuts down the filesystem

	 */

	tp->t_flags |= XFS_TRANS_DIRTY;

	lip = ops->create_done(tp, dfp->dfp_intent, dfp->dfp_count);

	lip = dfp->dfp_ops->create_done(tp, dfp->dfp_intent, dfp->dfp_count);

	if (!lip)

		return;
@@ -287,13 +286,13 @@ xfs_defer_create_intent( 
	struct xfs_defer_pending	*dfp,

	bool				sort)

{

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

	struct xfs_log_item		*lip;



	if (dfp->dfp_intent)

		return 1;



	lip = ops->create_intent(tp, &dfp->dfp_work, dfp->dfp_count, sort);

	lip = dfp->dfp_ops->create_intent(tp, &dfp->dfp_work, dfp->dfp_count,

			sort);

	if (!lip)

		return 0;

	if (IS_ERR(lip))
@@ -338,12 +337,10 @@ xfs_defer_pending_abort( 
	struct xfs_mount		*mp,

	struct xfs_defer_pending	*dfp)

{

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



	trace_xfs_defer_pending_abort(mp, dfp);



	if (dfp->dfp_intent && !dfp->dfp_done) {

		ops->abort_intent(dfp->dfp_intent);

		dfp->dfp_ops->abort_intent(dfp->dfp_intent);

		dfp->dfp_intent = NULL;

	}

}
@@ -353,7 +350,6 @@ xfs_defer_pending_cancel_work( 
	struct xfs_mount		*mp,

	struct xfs_defer_pending	*dfp)

{

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

	struct list_head		*pwi;

	struct list_head		*n;
@@ -364,7 +360,7 @@ xfs_defer_pending_cancel_work( 
		list_del(pwi);

		dfp->dfp_count--;

		trace_xfs_defer_cancel_item(mp, dfp, pwi);

		ops->cancel_item(pwi);

		dfp->dfp_ops->cancel_item(pwi);

	}

	ASSERT(dfp->dfp_count == 0);

	kmem_cache_free(xfs_defer_pending_cache, dfp);
@@ -522,11 +518,10 @@ xfs_defer_relog_intent( 
	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);

	lip = dfp->dfp_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);
@@ -593,7 +588,7 @@ xfs_defer_finish_one( 
	struct xfs_trans		*tp,

	struct xfs_defer_pending	*dfp)

{

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

	const struct xfs_defer_op_type	*ops = dfp->dfp_ops;

	struct xfs_btree_cur		*state = NULL;

	struct list_head		*li, *n;

	int				error;
@@ -790,7 +785,6 @@ xfs_defer_cancel( 
static inline struct xfs_defer_pending *

xfs_defer_find_last(

	struct xfs_trans		*tp,

	enum xfs_defer_ops_type		type,

	const struct xfs_defer_op_type	*ops)

{

	struct xfs_defer_pending	*dfp = NULL;
@@ -803,7 +797,7 @@ xfs_defer_find_last( 
			dfp_list);



	/* Wrong type? */

	if (dfp->dfp_type != type)

	if (dfp->dfp_ops != ops)

		return NULL;

	return dfp;

}
@@ -836,13 +830,13 @@ xfs_defer_can_append( 
static inline struct xfs_defer_pending *

xfs_defer_alloc(

	struct xfs_trans		*tp,

	enum xfs_defer_ops_type		type)

	const struct xfs_defer_op_type	*ops)

{

	struct xfs_defer_pending	*dfp;



	dfp = kmem_cache_zalloc(xfs_defer_pending_cache,

			GFP_NOFS | __GFP_NOFAIL);

	dfp->dfp_type = type;

	dfp->dfp_ops = ops;

	INIT_LIST_HEAD(&dfp->dfp_work);

	list_add_tail(&dfp->dfp_list, &tp->t_dfops);
@@ -862,9 +856,9 @@ xfs_defer_add( 
	ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);

	BUILD_BUG_ON(ARRAY_SIZE(defer_op_types) != XFS_DEFER_OPS_TYPE_MAX);



	dfp = xfs_defer_find_last(tp, type, ops);

	dfp = xfs_defer_find_last(tp, ops);

	if (!dfp || !xfs_defer_can_append(dfp, ops))

		dfp = xfs_defer_alloc(tp, type);

		dfp = xfs_defer_alloc(tp, ops);



	xfs_defer_add_item(dfp, li);

	trace_xfs_defer_add_item(tp->t_mountp, dfp, li);
@@ -880,17 +874,15 @@ xfs_defer_add_barrier( 
	struct xfs_trans		*tp)

{

	struct xfs_defer_pending	*dfp;

	const enum xfs_defer_ops_type	type = XFS_DEFER_OPS_TYPE_BARRIER;

	const struct xfs_defer_op_type	*ops = defer_op_types[type];



	ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);



	/* If the last defer op added was a barrier, we're done. */

	dfp = xfs_defer_find_last(tp, type, ops);

	dfp = xfs_defer_find_last(tp, &xfs_barrier_defer_type);

	if (dfp)

		return;



	xfs_defer_alloc(tp, type);

	xfs_defer_alloc(tp, &xfs_barrier_defer_type);



	trace_xfs_defer_add_item(tp->t_mountp, dfp, NULL);

}
@@ -909,7 +901,7 @@ xfs_defer_start_recovery( 


	dfp = kmem_cache_zalloc(xfs_defer_pending_cache,

			GFP_NOFS | __GFP_NOFAIL);

	dfp->dfp_type = dfp_type;

	dfp->dfp_ops = defer_op_types[dfp_type];

	dfp->dfp_intent = lip;

	INIT_LIST_HEAD(&dfp->dfp_work);

	list_add_tail(&dfp->dfp_list, r_dfops);
@@ -935,13 +927,12 @@ xfs_defer_finish_recovery( 
	struct xfs_defer_pending	*dfp,

	struct list_head		*capture_list)

{

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

	int				error;



	error = ops->recover_work(dfp, capture_list);

	error = dfp->dfp_ops->recover_work(dfp, capture_list);

	if (error)

		trace_xlog_intent_recovery_failed(mp, error,

				ops->recover_work);

				dfp->dfp_ops->recover_work);

	return error;

}

fs/xfs/libxfs/xfs_defer.h

+3 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ struct xfs_defer_pending { 
	struct list_head		dfp_work;	/* work items */

	struct xfs_log_item		*dfp_intent;	/* log intent item */

	struct xfs_log_item		*dfp_done;	/* log done item */

	const struct xfs_defer_op_type	*dfp_ops;

	unsigned int			dfp_count;	/* # extent items */

	unsigned int			dfp_flags;

	enum xfs_defer_ops_type		dfp_type;

};



/*
@@ -61,6 +61,8 @@ void xfs_defer_move(struct xfs_trans *dtp, struct xfs_trans *stp); 


/* Description of a deferred type. */

struct xfs_defer_op_type {

	const char		*name;

	unsigned int		max_items;

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

			struct list_head *items, unsigned int count, bool sort);

	void (*abort_intent)(struct xfs_log_item *intent);
@@ -76,7 +78,6 @@ struct xfs_defer_op_type { 
	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;

};



extern const struct xfs_defer_op_type xfs_bmap_update_defer_type;

fs/xfs/xfs_attr_item.c

+1 −0
Original line number Diff line number Diff line
@@ -677,6 +677,7 @@ xfs_attr_create_done( 
}



const struct xfs_defer_op_type xfs_attr_defer_type = {

	.name		= "attr",

	.max_items	= 1,

	.create_intent	= xfs_attr_create_intent,

	.abort_intent	= xfs_attr_abort_intent,

fs/xfs/xfs_bmap_item.c

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ xfs_bmap_relog_intent( 
}



const struct xfs_defer_op_type xfs_bmap_update_defer_type = {

	.name		= "bmap",

	.max_items	= XFS_BUI_MAX_FAST_EXTENTS,

	.create_intent	= xfs_bmap_update_create_intent,

	.abort_intent	= xfs_bmap_update_abort_intent,

fs/xfs/xfs_extfree_item.c

+2 −0
Original line number Diff line number Diff line
@@ -670,6 +670,7 @@ xfs_extent_free_relog_intent( 
}



const struct xfs_defer_op_type xfs_extent_free_defer_type = {

	.name		= "extent_free",

	.max_items	= XFS_EFI_MAX_FAST_EXTENTS,

	.create_intent	= xfs_extent_free_create_intent,

	.abort_intent	= xfs_extent_free_abort_intent,
@@ -682,6 +683,7 @@ const struct xfs_defer_op_type xfs_extent_free_defer_type = { 


/* sub-type with special handling for AGFL deferred frees */

const struct xfs_defer_op_type xfs_agfl_free_defer_type = {

	.name		= "agfl_free",

	.max_items	= XFS_EFI_MAX_FAST_EXTENTS,

	.create_intent	= xfs_extent_free_create_intent,

	.abort_intent	= xfs_extent_free_abort_intent,