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

!9160 xfs: don't use current->journal_info 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhihao Cheng <chengzhihao@huaweicloud.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JALI4DHO5DROX2GIQWVFLRW33DBY6IQM/ 
 
https://gitee.com/openeuler/kernel/issues/IA6CG1 
 
Link:https://gitee.com/openeuler/kernel/pulls/9160

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 5168f76e fb2eafca

fs/xfs/xfs_aops.c

+0 −13
Original line number Diff line number Diff line
@@ -552,12 +552,6 @@ xfs_vm_writepage( 
{

	struct xfs_writepage_ctx wpc = { };



	if (WARN_ON_ONCE(current->journal_info)) {

		redirty_page_for_writepage(wbc, page);

		unlock_page(page);

		return 0;

	}



	return iomap_writepage(page, wbc, &wpc.ctx, &xfs_writeback_ops);

}
@@ -568,13 +562,6 @@ xfs_vm_writepages( 
{

	struct xfs_writepage_ctx wpc = { };



	/*

	 * Writing back data in a transaction context can result in recursive

	 * transactions. This is bad, so issue a warning and get out of here.

	 */

	if (WARN_ON_ONCE(current->journal_info))

		return 0;



	xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED);

	return iomap_writepages(mapping, wbc, &wpc.ctx, &xfs_writeback_ops);

}

fs/xfs/xfs_icache.c

+5 −3
Original line number Diff line number Diff line
@@ -2043,8 +2043,10 @@ xfs_inodegc_want_queue_work( 
 *  - Memory shrinkers queued the inactivation worker and it hasn't finished.

 *  - The queue depth exceeds the maximum allowable percpu backlog.

 *

 * Note: If the current thread is running a transaction, we don't ever want to

 * wait for other transactions because that could introduce a deadlock.

 * Note: If we are in a NOFS context here (e.g. current thread is running a

 * transaction) the we don't want to block here as inodegc progress may require

 * filesystem resources we hold to make progress and that could result in a

 * deadlock. Hence we skip out of here if we are in a scoped NOFS context.

 */

static inline bool

xfs_inodegc_want_flush_work(
@@ -2052,7 +2054,7 @@ xfs_inodegc_want_flush_work( 
	unsigned int		items,

	unsigned int		shrinker_hits)

{

	if (current->journal_info)

	if (current->flags & PF_MEMALLOC_NOFS)

		return false;



	if (shrinker_hits > 0)

fs/xfs/xfs_trans.h

+1 −8
Original line number Diff line number Diff line
@@ -271,19 +271,14 @@ static inline void 
xfs_trans_set_context(

	struct xfs_trans	*tp)

{

	ASSERT(current->journal_info == NULL);

	tp->t_pflags = memalloc_nofs_save();

	current->journal_info = tp;

}



static inline void

xfs_trans_clear_context(

	struct xfs_trans	*tp)

{

	if (current->journal_info == tp) {

	memalloc_nofs_restore(tp->t_pflags);

		current->journal_info = NULL;

	}

}



static inline void
@@ -291,10 +286,8 @@ xfs_trans_switch_context( 
	struct xfs_trans	*old_tp,

	struct xfs_trans	*new_tp)

{

	ASSERT(current->journal_info == old_tp);

	new_tp->t_pflags = old_tp->t_pflags;

	old_tp->t_pflags = 0;

	current->journal_info = new_tp;

}



#endif	/* __XFS_TRANS_H__ */