f2fs: clean up kvfree
After commit 0b6d4ca04a
("f2fs: don't return vmalloc() memory from
f2fs_kmalloc()"), f2fs_k{m,z}alloc() will not return vmalloc()'ed
memory, so clean up to use kfree() instead of kvfree() to free
vmalloc()'ed memory.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
@@ -728,7 +728,7 @@ init_thread:
|
||||
"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));
|
||||
if (IS_ERR(fcc->f2fs_issue_flush)) {
|
||||
err = PTR_ERR(fcc->f2fs_issue_flush);
|
||||
kvfree(fcc);
|
||||
kfree(fcc);
|
||||
SM_I(sbi)->fcc_info = NULL;
|
||||
return err;
|
||||
}
|
||||
@@ -747,7 +747,7 @@ void f2fs_destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)
|
||||
kthread_stop(flush_thread);
|
||||
}
|
||||
if (free) {
|
||||
kvfree(fcc);
|
||||
kfree(fcc);
|
||||
SM_I(sbi)->fcc_info = NULL;
|
||||
}
|
||||
}
|
||||
@@ -2105,7 +2105,7 @@ init_thread:
|
||||
"f2fs_discard-%u:%u", MAJOR(dev), MINOR(dev));
|
||||
if (IS_ERR(dcc->f2fs_issue_discard)) {
|
||||
err = PTR_ERR(dcc->f2fs_issue_discard);
|
||||
kvfree(dcc);
|
||||
kfree(dcc);
|
||||
SM_I(sbi)->dcc_info = NULL;
|
||||
return err;
|
||||
}
|
||||
@@ -2129,7 +2129,7 @@ static void destroy_discard_cmd_control(struct f2fs_sb_info *sbi)
|
||||
if (unlikely(atomic_read(&dcc->discard_cmd_cnt)))
|
||||
f2fs_issue_discard_timeout(sbi);
|
||||
|
||||
kvfree(dcc);
|
||||
kfree(dcc);
|
||||
SM_I(sbi)->dcc_info = NULL;
|
||||
}
|
||||
|
||||
@@ -5151,7 +5151,7 @@ static void destroy_dirty_segmap(struct f2fs_sb_info *sbi)
|
||||
|
||||
destroy_victim_secmap(sbi);
|
||||
SM_I(sbi)->dirty_info = NULL;
|
||||
kvfree(dirty_i);
|
||||
kfree(dirty_i);
|
||||
}
|
||||
|
||||
static void destroy_curseg(struct f2fs_sb_info *sbi)
|
||||
@@ -5163,10 +5163,10 @@ static void destroy_curseg(struct f2fs_sb_info *sbi)
|
||||
return;
|
||||
SM_I(sbi)->curseg_array = NULL;
|
||||
for (i = 0; i < NR_CURSEG_TYPE; i++) {
|
||||
kvfree(array[i].sum_blk);
|
||||
kvfree(array[i].journal);
|
||||
kfree(array[i].sum_blk);
|
||||
kfree(array[i].journal);
|
||||
}
|
||||
kvfree(array);
|
||||
kfree(array);
|
||||
}
|
||||
|
||||
static void destroy_free_segmap(struct f2fs_sb_info *sbi)
|
||||
@@ -5177,7 +5177,7 @@ static void destroy_free_segmap(struct f2fs_sb_info *sbi)
|
||||
SM_I(sbi)->free_info = NULL;
|
||||
kvfree(free_i->free_segmap);
|
||||
kvfree(free_i->free_secmap);
|
||||
kvfree(free_i);
|
||||
kfree(free_i);
|
||||
}
|
||||
|
||||
static void destroy_sit_info(struct f2fs_sb_info *sbi)
|
||||
@@ -5189,7 +5189,7 @@ static void destroy_sit_info(struct f2fs_sb_info *sbi)
|
||||
|
||||
if (sit_i->sentries)
|
||||
kvfree(sit_i->bitmap);
|
||||
kvfree(sit_i->tmp_map);
|
||||
kfree(sit_i->tmp_map);
|
||||
|
||||
kvfree(sit_i->sentries);
|
||||
kvfree(sit_i->sec_entries);
|
||||
@@ -5201,7 +5201,7 @@ static void destroy_sit_info(struct f2fs_sb_info *sbi)
|
||||
kvfree(sit_i->sit_bitmap_mir);
|
||||
kvfree(sit_i->invalid_segmap);
|
||||
#endif
|
||||
kvfree(sit_i);
|
||||
kfree(sit_i);
|
||||
}
|
||||
|
||||
void f2fs_destroy_segment_manager(struct f2fs_sb_info *sbi)
|
||||
@@ -5217,7 +5217,7 @@ void f2fs_destroy_segment_manager(struct f2fs_sb_info *sbi)
|
||||
destroy_free_segmap(sbi);
|
||||
destroy_sit_info(sbi);
|
||||
sbi->sm_info = NULL;
|
||||
kvfree(sm_info);
|
||||
kfree(sm_info);
|
||||
}
|
||||
|
||||
int __init f2fs_create_segment_manager_caches(void)
|
||||
|
Reference in New Issue
Block a user