Unverified Commit 2aefae45 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10068 [sync] PR-9984: nilfs2: fix potential kernel bug due to lack of writeback flag waiting 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/9984 
 
PR sync from: dinglongwei <dinglongwei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RC4YYR6AGL2UW4JWTODHYCPDXJBNYPHO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA8AE5 
 
Link:https://gitee.com/openeuler/kernel/pulls/10068

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents eee215c7 389dff5e

fs/nilfs2/segment.c

+3 −0
Original line number Diff line number Diff line
@@ -1667,6 +1667,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);
@@ -1680,6 +1681,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);
@@ -1696,6 +1698,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);