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

xfs: move ->iop_recover to xfs_defer_op_type 



Finish off the series by moving the intent item recovery function
pointer to the xfs_defer_op_type struct, since this is really a deferred
work function now.

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

fs/xfs/libxfs/xfs_defer.c

+17 −0
Original line number Diff line number Diff line
@@ -713,6 +713,23 @@ xfs_defer_cancel_recovery( 
	xfs_defer_pending_cancel_work(mp, dfp);

}



/* Replay the deferred work item created from a recovered log intent item. */

int

xfs_defer_finish_recovery(

	struct xfs_mount		*mp,

	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);

	if (error)

		trace_xlog_intent_recovery_failed(mp, error,

				ops->recover_work);

	return error;

}



/*

 * Move deferred ops from one transaction to another and reset the source to

 * initial state. This is primarily used to carry state forward across

fs/xfs/libxfs/xfs_defer.h

+4 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ struct xfs_defer_op_type { 
	void (*finish_cleanup)(struct xfs_trans *tp,

			struct xfs_btree_cur *state, int error);

	void (*cancel_item)(struct list_head *item);

	int (*recover_work)(struct xfs_defer_pending *dfp,

			    struct list_head *capture_list);

	unsigned int		max_items;

};
@@ -130,6 +132,8 @@ void xfs_defer_start_recovery(struct xfs_log_item *lip, 
		enum xfs_defer_ops_type dfp_type, struct list_head *r_dfops);

void xfs_defer_cancel_recovery(struct xfs_mount *mp,

		struct xfs_defer_pending *dfp);

int xfs_defer_finish_recovery(struct xfs_mount *mp,

		struct xfs_defer_pending *dfp, struct list_head *capture_list);



static inline void

xfs_defer_add_item(

fs/xfs/libxfs/xfs_log_recover.h

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ xlog_recover_resv(const struct xfs_trans_res *r) 
	return ret;

}



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);

int xlog_recover_finish_intent(struct xfs_trans *tp,

fs/xfs/xfs_attr_item.c

+12 −9
Original line number Diff line number Diff line
@@ -544,12 +544,17 @@ xfs_attri_recover_work( 
	struct xfs_mount		*mp,

	struct xfs_defer_pending	*dfp,

	struct xfs_attri_log_format	*attrp,

	struct xfs_inode		*ip,

	struct xfs_inode		**ipp,

	struct xfs_attri_log_nameval	*nv)

{

	struct xfs_attr_intent		*attr;

	struct xfs_da_args		*args;

	int				local;

	int				error;



	error = xlog_recover_iget(mp,  attrp->alfi_ino, ipp);

	if (error)

		return ERR_PTR(error);



	attr = kmem_zalloc(sizeof(struct xfs_attr_intent) +

			   sizeof(struct xfs_da_args), KM_NOFS);
@@ -567,7 +572,7 @@ xfs_attri_recover_work( 
	attr->xattri_nameval = xfs_attri_log_nameval_get(nv);

	ASSERT(attr->xattri_nameval);



	args->dp = ip;

	args->dp = *ipp;

	args->geo = mp->m_attr_geo;

	args->whichfork = XFS_ATTR_FORK;

	args->name = nv->name.i_addr;
@@ -604,7 +609,7 @@ xfs_attri_recover_work( 
 * delete the attr that it describes.

 */

STATIC int

xfs_attri_item_recover(

xfs_attr_recover_work(

	struct xfs_defer_pending	*dfp,

	struct list_head		*capture_list)

{
@@ -630,11 +635,9 @@ xfs_attri_item_recover( 
	    !xfs_attr_namecheck(nv->name.i_addr, nv->name.i_len))

		return -EFSCORRUPTED;



	error = xlog_recover_iget(mp,  attrp->alfi_ino, &ip);

	if (error)

		return error;



	attr = xfs_attri_recover_work(mp, dfp, attrp, ip, nv);

	attr = xfs_attri_recover_work(mp, dfp, attrp, &ip, nv);

	if (IS_ERR(attr))

		return PTR_ERR(attr);

	args = attr->xattri_da_args;



	xfs_init_attr_trans(args, &resv, &total);
@@ -820,6 +823,7 @@ const struct xfs_defer_op_type xfs_attr_defer_type = { 
	.create_done	= xfs_attr_create_done,

	.finish_item	= xfs_attr_finish_item,

	.cancel_item	= xfs_attr_cancel_item,

	.recover_work	= xfs_attr_recover_work,

};



/*
@@ -856,7 +860,6 @@ static const struct xfs_item_ops xfs_attri_item_ops = { 
	.iop_format	= xfs_attri_item_format,

	.iop_unpin	= xfs_attri_item_unpin,

	.iop_release    = xfs_attri_item_release,

	.iop_recover	= xfs_attri_item_recover,

	.iop_match	= xfs_attri_item_match,

	.iop_relog	= xfs_attri_item_relog,

};

fs/xfs/xfs_bmap_item.c

+21 −18
Original line number Diff line number Diff line
@@ -437,15 +437,6 @@ xfs_bmap_update_cancel_item( 
	kmem_cache_free(xfs_bmap_intent_cache, bi);

}



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,

};



/* Is this recovered BUI ok? */

static inline bool

xfs_bui_validate(
@@ -484,9 +475,15 @@ static inline struct xfs_bmap_intent * 
xfs_bui_recover_work(

	struct xfs_mount		*mp,

	struct xfs_defer_pending	*dfp,

	struct xfs_inode		**ipp,

	struct xfs_map_extent		*map)

{

	struct xfs_bmap_intent		*bi;

	int				error;



	error = xlog_recover_iget(mp, map->me_owner, ipp);

	if (error)

		return ERR_PTR(error);



	bi = kmem_cache_zalloc(xfs_bmap_intent_cache, GFP_NOFS | __GFP_NOFAIL);

	bi->bi_whichfork = (map->me_flags & XFS_BMAP_EXTENT_ATTR_FORK) ?
@@ -497,6 +494,7 @@ xfs_bui_recover_work( 
	bi->bi_bmap.br_blockcount = map->me_len;

	bi->bi_bmap.br_state = (map->me_flags & XFS_BMAP_EXTENT_UNWRITTEN) ?

			XFS_EXT_UNWRITTEN : XFS_EXT_NORM;

	bi->bi_owner = *ipp;

	xfs_bmap_update_get_group(mp, bi);



	xfs_defer_add_item(dfp, &bi->bi_list);
@@ -508,7 +506,7 @@ xfs_bui_recover_work( 
 * We need to update some inode's bmbt.

 */

STATIC int

xfs_bui_item_recover(

xfs_bmap_recover_work(

	struct xfs_defer_pending	*dfp,

	struct list_head		*capture_list)

{
@@ -530,11 +528,9 @@ xfs_bui_item_recover( 
	}



	map = &buip->bui_format.bui_extents[0];

	work = xfs_bui_recover_work(mp, dfp, map);



	error = xlog_recover_iget(mp, map->me_owner, &ip);

	if (error)

		return error;

	work = xfs_bui_recover_work(mp, dfp, &ip, map);

	if (IS_ERR(work))

		return PTR_ERR(work);



	/* Allocate transaction and do the work. */

	resv = xlog_recover_resv(&M_RES(mp)->tr_itruncate);
@@ -557,8 +553,6 @@ xfs_bui_item_recover( 
	if (error)

		goto err_cancel;



	work->bi_owner = ip;



	error = xlog_recover_finish_intent(tp, dfp);

	if (error == -EFSCORRUPTED)

		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
@@ -587,6 +581,16 @@ xfs_bui_item_recover( 
	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,
@@ -627,7 +631,6 @@ static const struct xfs_item_ops xfs_bui_item_ops = { 
	.iop_format	= xfs_bui_item_format,

	.iop_unpin	= xfs_bui_item_unpin,

	.iop_release	= xfs_bui_item_release,

	.iop_recover	= xfs_bui_item_recover,

	.iop_match	= xfs_bui_item_match,

	.iop_relog	= xfs_bui_item_relog,

};