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

!14455 f2fs: fix race in concurrent f2fs_stop_gc_thread 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cai Xinchen <caixinchen1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/X23WEKVHIS6SPJRXPDNPBIF2AZZHKPMP/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEAES 
 
Link:https://gitee.com/openeuler/kernel/pulls/14455

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 808cdaaa 2f8f49d6

fs/f2fs/file.c

+6 −3
Original line number Diff line number Diff line
@@ -2321,9 +2321,12 @@ int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag, 
	if (readonly)

		goto out;



	/* grab sb->s_umount to avoid racing w/ remount() */

	/*

	 * grab sb->s_umount to avoid racing w/ remount() and other shutdown

	 * paths.

	 */

	if (need_lock)

		down_read(&sbi->sb->s_umount);

		down_write(&sbi->sb->s_umount);



	f2fs_stop_gc_thread(sbi);

	f2fs_stop_discard_thread(sbi);
@@ -2332,7 +2335,7 @@ int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag, 
	clear_opt(sbi, DISCARD);



	if (need_lock)

		up_read(&sbi->sb->s_umount);

		up_write(&sbi->sb->s_umount);



	f2fs_update_time(sbi, REQ_TIME);

out: