Unverified Commit 9b86cb00 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9660 nilfs2: fix potential kernel bug due to lack of writeback flag waiting 

Merge Pull Request from: @ci-robot 
 
PR sync from: dinglongwei <dinglongwei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RJ7IXN55YWG4E2PQ5AVBVFXV3WUBWGII/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA8AE5 
 
Link:https://gitee.com/openeuler/kernel/pulls/9660

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 393e79c0 4998db6d

fs/nilfs2/segment.c

+3 −0
Original line number Diff line number Diff line
@@ -1658,6 +1658,7 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci) 
			if (bh->b_page != bd_page) {

				if (bd_page) {

					lock_page(bd_page);

					wait_on_page_writeback(bd_page);

					clear_page_dirty_for_io(bd_page);

					set_page_writeback(bd_page);

					unlock_page(bd_page);
@@ -1671,6 +1672,7 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci) 
			if (bh == segbuf->sb_super_root) {

				if (bh->b_page != bd_page) {

					lock_page(bd_page);

					wait_on_page_writeback(bd_page);

					clear_page_dirty_for_io(bd_page);

					set_page_writeback(bd_page);

					unlock_page(bd_page);
@@ -1687,6 +1689,7 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci) 
	}

	if (bd_page) {

		lock_page(bd_page);

		wait_on_page_writeback(bd_page);

		clear_page_dirty_for_io(bd_page);

		set_page_writeback(bd_page);

		unlock_page(bd_page);