Skip to content

Commit

Permalink
f2fs: clean up destroy_discard_cmd_control
Browse files Browse the repository at this point in the history
Remove unneeded parameter and simply change flow in
destroy_discard_cmd_control.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
  • Loading branch information
Chao Yu authored and Jaegeuk Kim committed Apr 5, 2017
1 parent 5f32366 commit f099405
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions fs/f2fs/segment.c
Original file line number Diff line number Diff line change
@@ -1167,20 +1167,22 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
return err;
}

static void destroy_discard_cmd_control(struct f2fs_sb_info *sbi, bool free)
static void destroy_discard_cmd_control(struct f2fs_sb_info *sbi)
{
struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;

if (dcc && dcc->f2fs_issue_discard) {
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);
}
if (free) {
kfree(dcc);
SM_I(sbi)->dcc_info = NULL;
}

kfree(dcc);
SM_I(sbi)->dcc_info = NULL;
}

static bool __mark_sit_entry_dirty(struct f2fs_sb_info *sbi, unsigned int segno)
@@ -3073,7 +3075,7 @@ void destroy_segment_manager(struct f2fs_sb_info *sbi)
if (!sm_info)
return;
destroy_flush_cmd_control(sbi, true);
destroy_discard_cmd_control(sbi, true);
destroy_discard_cmd_control(sbi);
destroy_dirty_segmap(sbi);
destroy_curseg(sbi);
destroy_free_segmap(sbi);

0 comments on commit f099405

Please sign in to comment.