evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

f2fs: wait for discard completion after submission

Browse source 
We don't need to wait for each discard commands when unmounting the image.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Jaegeuk Kim 2017-02-22 19:58:23 -08:00
parent 94d3f18b4f
commit 97a61adb90
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs/f2fs/segment.c
View file

@ -676,8 +676,12 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info; struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
struct list_head *wait_list = &(dcc->discard_cmd_list); struct list_head *wait_list = &(dcc->discard_cmd_list);
struct discard_cmd *dc, *tmp; struct discard_cmd *dc, *tmp;
struct blk_plug plug;
mutex_lock(&dcc->cmd_lock); mutex_lock(&dcc->cmd_lock);
blk_start_plug(&plug);
list_for_each_entry_safe(dc, tmp, wait_list, list) { list_for_each_entry_safe(dc, tmp, wait_list, list) {
if (blkaddr == NULL_ADDR) { if (blkaddr == NULL_ADDR) {
@ -686,9 +690,6 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
submit_bio(REQ_SYNC, dc->bio); submit_bio(REQ_SYNC, dc->bio);
atomic_inc(&dcc->submit_discard); atomic_inc(&dcc->submit_discard);
} }
wait_for_completion_io(&dc->wait);
__remove_discard_cmd(sbi, dc);
continue; continue;
} }
@ -699,6 +700,15 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
__remove_discard_cmd(sbi, dc); __remove_discard_cmd(sbi, dc);
} }
} }
blk_finish_plug(&plug);
/* this comes from f2fs_put_super */
if (blkaddr == NULL_ADDR) {
list_for_each_entry_safe(dc, tmp, wait_list, list) {
wait_for_completion_io(&dc->wait);
__remove_discard_cmd(sbi, dc);
}
}
mutex_unlock(&dcc->cmd_lock); mutex_unlock(&dcc->cmd_lock);
} }