|
@@ -1065,6 +1065,18 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
|
|
|
__wait_one_discard_bio(sbi, dc);
|
|
|
}
|
|
|
|
|
|
+void stop_discard_thread(struct f2fs_sb_info *sbi)
|
|
|
+{
|
|
|
+ struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
|
|
|
+
|
|
|
+ if (dcc && dcc->f2fs_issue_discard) {
|
|
|
+ struct task_struct *discard_thread = dcc->f2fs_issue_discard;
|
|
|
+
|
|
|
+ dcc->f2fs_issue_discard = NULL;
|
|
|
+ kthread_stop(discard_thread);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
/* This comes from f2fs_put_super */
|
|
|
void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi)
|
|
|
{
|
|
@@ -1422,12 +1434,7 @@ static void destroy_discard_cmd_control(struct f2fs_sb_info *sbi)
|
|
|
if (!dcc)
|
|
|
return;
|
|
|
|
|
|
- if (dcc->f2fs_issue_discard) {
|
|
|
- struct task_struct *discard_thread = dcc->f2fs_issue_discard;
|
|
|
-
|
|
|
- dcc->f2fs_issue_discard = NULL;
|
|
|
- kthread_stop(discard_thread);
|
|
|
- }
|
|
|
+ stop_discard_thread(sbi);
|
|
|
|
|
|
kfree(dcc);
|
|
|
SM_I(sbi)->dcc_info = NULL;
|