|
@@ -489,8 +489,13 @@ int f2fs_issue_flush(struct f2fs_sb_info *sbi)
|
|
|
if (!fcc->dispatch_list)
|
|
|
wake_up(&fcc->flush_wait_queue);
|
|
|
|
|
|
- wait_for_completion(&cmd.wait);
|
|
|
- atomic_dec(&fcc->submit_flush);
|
|
|
+ if (fcc->f2fs_issue_flush) {
|
|
|
+ wait_for_completion(&cmd.wait);
|
|
|
+ atomic_dec(&fcc->submit_flush);
|
|
|
+ } else {
|
|
|
+ llist_del_all(&fcc->issue_list);
|
|
|
+ atomic_set(&fcc->submit_flush, 0);
|
|
|
+ }
|
|
|
|
|
|
return cmd.ret;
|
|
|
}
|
|
@@ -501,6 +506,11 @@ int create_flush_cmd_control(struct f2fs_sb_info *sbi)
|
|
|
struct flush_cmd_control *fcc;
|
|
|
int err = 0;
|
|
|
|
|
|
+ if (SM_I(sbi)->cmd_control_info) {
|
|
|
+ fcc = SM_I(sbi)->cmd_control_info;
|
|
|
+ goto init_thread;
|
|
|
+ }
|
|
|
+
|
|
|
fcc = kzalloc(sizeof(struct flush_cmd_control), GFP_KERNEL);
|
|
|
if (!fcc)
|
|
|
return -ENOMEM;
|
|
@@ -508,6 +518,7 @@ int create_flush_cmd_control(struct f2fs_sb_info *sbi)
|
|
|
init_waitqueue_head(&fcc->flush_wait_queue);
|
|
|
init_llist_head(&fcc->issue_list);
|
|
|
SM_I(sbi)->cmd_control_info = fcc;
|
|
|
+init_thread:
|
|
|
fcc->f2fs_issue_flush = kthread_run(issue_flush_thread, sbi,
|
|
|
"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));
|
|
|
if (IS_ERR(fcc->f2fs_issue_flush)) {
|
|
@@ -520,14 +531,20 @@ int create_flush_cmd_control(struct f2fs_sb_info *sbi)
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-void destroy_flush_cmd_control(struct f2fs_sb_info *sbi)
|
|
|
+void destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)
|
|
|
{
|
|
|
struct flush_cmd_control *fcc = SM_I(sbi)->cmd_control_info;
|
|
|
|
|
|
- if (fcc && fcc->f2fs_issue_flush)
|
|
|
- kthread_stop(fcc->f2fs_issue_flush);
|
|
|
- kfree(fcc);
|
|
|
- SM_I(sbi)->cmd_control_info = NULL;
|
|
|
+ if (fcc && fcc->f2fs_issue_flush) {
|
|
|
+ struct task_struct *flush_thread = fcc->f2fs_issue_flush;
|
|
|
+
|
|
|
+ fcc->f2fs_issue_flush = NULL;
|
|
|
+ kthread_stop(flush_thread);
|
|
|
+ }
|
|
|
+ if (free) {
|
|
|
+ kfree(fcc);
|
|
|
+ SM_I(sbi)->cmd_control_info = NULL;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static void __locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,
|
|
@@ -2738,7 +2755,7 @@ void destroy_segment_manager(struct f2fs_sb_info *sbi)
|
|
|
|
|
|
if (!sm_info)
|
|
|
return;
|
|
|
- destroy_flush_cmd_control(sbi);
|
|
|
+ destroy_flush_cmd_control(sbi, true);
|
|
|
destroy_dirty_segmap(sbi);
|
|
|
destroy_curseg(sbi);
|
|
|
destroy_free_segmap(sbi);
|