Unverified Commit 0e8f2fe7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1377 [sync] PR-1376: jbd2: Check 'jh->b_transaction' before remove it from checkpoint 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1376 
 
PR sync from: Zhihao Cheng <chengzhihao1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XNJZFYFNQIMIIQRPICSJB7KUZJDPS27T/ 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1377

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
parents d57eaffd a49943e0

fs/jbd2/checkpoint.c

+2 −0
Original line number Diff line number Diff line
@@ -641,6 +641,8 @@ int jbd2_journal_try_remove_checkpoint(struct journal_head *jh) 
{

	struct buffer_head *bh = jh2bh(jh);



	if (jh->b_transaction)

		return -EBUSY;

	if (!trylock_buffer(bh))

		return -EBUSY;

	if (buffer_dirty(bh)) {