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

xfs: pass the defer ops instead of type to xfs_defer_start_recovery 



xfs_defer_start_recovery is only called from xlog_recover_intent_item,
and the callers of that all have the actual xfs_defer_ops_type operation
vector at hand.  Pass that directly instead of looking it up from the
defer_op_types table.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 7f2f7531

fs/xfs/libxfs/xfs_defer.c

+3 −3
Original line number Diff line number Diff line
@@ -894,14 +894,14 @@ xfs_defer_add_barrier( 
void

xfs_defer_start_recovery(

	struct xfs_log_item		*lip,

	enum xfs_defer_ops_type		dfp_type,

	struct list_head		*r_dfops)

	struct list_head		*r_dfops,

	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_ops = defer_op_types[dfp_type];

	dfp->dfp_ops = ops;

	dfp->dfp_intent = lip;

	INIT_LIST_HEAD(&dfp->dfp_work);

	list_add_tail(&dfp->dfp_list, r_dfops);

fs/xfs/libxfs/xfs_defer.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void xfs_defer_ops_capture_abort(struct xfs_mount *mp, 
void xfs_defer_resources_rele(struct xfs_defer_resources *dres);



void xfs_defer_start_recovery(struct xfs_log_item *lip,

		enum xfs_defer_ops_type dfp_type, struct list_head *r_dfops);

		struct list_head *r_dfops, const struct xfs_defer_op_type *ops);

void xfs_defer_cancel_recovery(struct xfs_mount *mp,

		struct xfs_defer_pending *dfp);

int xfs_defer_finish_recovery(struct xfs_mount *mp,

fs/xfs/libxfs/xfs_log_recover.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * define how recovery should work for that type of log item.

 */

struct xlog_recover_item;

struct xfs_defer_op_type;



/* Sorting hat for log items as they're read in. */

enum xlog_recover_reorder {
@@ -156,7 +157,7 @@ xlog_recover_resv(const struct xfs_trans_res *r) 
struct xfs_defer_pending;



void xlog_recover_intent_item(struct xlog *log, struct xfs_log_item *lip,

		xfs_lsn_t lsn, unsigned int dfp_type);

		xfs_lsn_t lsn, const struct xfs_defer_op_type *ops);

int xlog_recover_finish_intent(struct xfs_trans *tp,

		struct xfs_defer_pending *dfp);

fs/xfs/xfs_attr_item.c

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ xlog_recover_attri_commit_pass2( 
	memcpy(&attrip->attri_format, attri_formatp, len);



	xlog_recover_intent_item(log, &attrip->attri_item, lsn,

			XFS_DEFER_OPS_TYPE_ATTR);

			&xfs_attr_defer_type);

	xfs_attri_log_nameval_put(nv);

	return 0;

}

fs/xfs/xfs_bmap_item.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ xlog_recover_bui_commit_pass2( 
	atomic_set(&buip->bui_next_extent, bui_formatp->bui_nextents);



	xlog_recover_intent_item(log, &buip->bui_item, lsn,

			XFS_DEFER_OPS_TYPE_BMAP);

			&xfs_bmap_update_defer_type);

	return 0;

}