Skip to content

Commit d4fdf8b

Browse files
Yunlei HeJaegeuk Kim
Yunlei He
authored and
Jaegeuk Kim
committed
f2fs: fix a panic caused by NULL flush_cmd_control
Mount fs with option noflush_merge, boot failed for illegal address fcc in function f2fs_issue_flush: if (!test_opt(sbi, FLUSH_MERGE)) { ret = submit_flush_wait(sbi); atomic_inc(&fcc->issued_flush); -> Here, fcc illegal return ret; } Signed-off-by: Yunlei He <heyunlei@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 68390dd commit d4fdf8b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Diff for: fs/f2fs/segment.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,9 @@ int create_flush_cmd_control(struct f2fs_sb_info *sbi)
566566
init_waitqueue_head(&fcc->flush_wait_queue);
567567
init_llist_head(&fcc->issue_list);
568568
SM_I(sbi)->fcc_info = fcc;
569+
if (!test_opt(sbi, FLUSH_MERGE))
570+
return err;
571+
569572
init_thread:
570573
fcc->f2fs_issue_flush = kthread_run(issue_flush_thread, sbi,
571574
"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));
@@ -3240,7 +3243,7 @@ int build_segment_manager(struct f2fs_sb_info *sbi)
32403243

32413244
INIT_LIST_HEAD(&sm_info->sit_entry_set);
32423245

3243-
if (test_opt(sbi, FLUSH_MERGE) && !f2fs_readonly(sbi->sb)) {
3246+
if (!f2fs_readonly(sbi->sb)) {
32443247
err = create_flush_cmd_control(sbi);
32453248
if (err)
32463249
return err;

0 commit comments

Comments
 (0)