Unverified Commit 25d100f4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3156 xfs: fix intent item leak during reovery 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/47BEYJMEIZKSYITYMZQFSX4WHF5UWKCW/ 
This patch set fix intent item leak during reovery when recovery intent
fails.

Long Li (2):
  xfs: factor out xfs_defer_pending_abort
  xfs: abort intent items when recovery intents fail


-- 
2.31.1
 
https://gitee.com/openeuler/kernel/issues/I8LHTR 
 
Link:https://gitee.com/openeuler/kernel/pulls/3156

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents b0f397be 4755ad4c

fs/xfs/libxfs/xfs_defer.c

+18 −10
Original line number Diff line number Diff line
@@ -245,21 +245,18 @@ xfs_defer_create_intents( 
	return ret;

}



/* Abort all the intents that were committed. */

STATIC void

xfs_defer_trans_abort(

	struct xfs_trans		*tp,

	struct list_head		*dop_pending)

xfs_defer_pending_abort(

	struct xfs_mount		*mp,

	struct list_head		*dop_list)

{

	struct xfs_defer_pending	*dfp;

	const struct xfs_defer_op_type	*ops;



	trace_xfs_defer_trans_abort(tp, _RET_IP_);



	/* Abort intent items that don't have a done item. */

	list_for_each_entry(dfp, dop_pending, dfp_list) {

	list_for_each_entry(dfp, dop_list, dfp_list) {

		ops = defer_op_types[dfp->dfp_type];

		trace_xfs_defer_pending_abort(tp->t_mountp, dfp);

		trace_xfs_defer_pending_abort(mp, dfp);

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

			ops->abort_intent(dfp->dfp_intent);

			dfp->dfp_intent = NULL;
@@ -267,6 +264,16 @@ xfs_defer_trans_abort( 
	}

}



/* Abort all the intents that were committed. */

STATIC void

xfs_defer_trans_abort(

	struct xfs_trans		*tp,

	struct list_head		*dop_pending)

{

	trace_xfs_defer_trans_abort(tp, _RET_IP_);

	xfs_defer_pending_abort(tp->t_mountp, dop_pending);

}



/*

 * Capture resources that the caller said not to release ("held") when the

 * transaction commits.  Caller is responsible for zero-initializing @dres.
@@ -756,12 +763,13 @@ xfs_defer_ops_capture( 


/* Release all resources that we used to capture deferred ops. */

void

xfs_defer_ops_capture_free(

xfs_defer_ops_capture_abort(

	struct xfs_mount		*mp,

	struct xfs_defer_capture	*dfc)

{

	unsigned short			i;



	xfs_defer_pending_abort(mp, &dfc->dfc_dfops);

	xfs_defer_cancel_list(mp, &dfc->dfc_dfops);



	for (i = 0; i < dfc->dfc_held.dr_bufs; i++)
@@ -802,7 +810,7 @@ xfs_defer_ops_capture_and_commit( 
	/* Commit the transaction and add the capture structure to the list. */

	error = xfs_trans_commit(tp);

	if (error) {

		xfs_defer_ops_capture_free(mp, dfc);

		xfs_defer_ops_capture_abort(mp, dfc);

		return error;

	}

fs/xfs/libxfs/xfs_defer.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int xfs_defer_ops_capture_and_commit(struct xfs_trans *tp, 
		struct list_head *capture_list);

void xfs_defer_ops_continue(struct xfs_defer_capture *d, struct xfs_trans *tp,

		struct xfs_defer_resources *dres);

void xfs_defer_ops_capture_free(struct xfs_mount *mp,

void xfs_defer_ops_capture_abort(struct xfs_mount *mp,

		struct xfs_defer_capture *d);

void xfs_defer_resources_rele(struct xfs_defer_resources *dres);

fs/xfs/xfs_log_recover.c

+1 −1
Original line number Diff line number Diff line
@@ -2511,7 +2511,7 @@ xlog_abort_defer_ops( 


	list_for_each_entry_safe(dfc, next, capture_list, dfc_list) {

		list_del_init(&dfc->dfc_list);

		xfs_defer_ops_capture_free(mp, dfc);

		xfs_defer_ops_capture_abort(mp, dfc);

	}

}