summaryrefslogtreecommitdiff
path: root/fs/f2fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2017-02-22 19:58:23 -0800
committerJaegeuk Kim <jaegeuk@kernel.org>2017-02-27 09:59:39 -0800
commit40465257ac4159e9ebfba10ee502e795b917da76 (patch)
treea3a5c8a58c1cda61762938f33ffde734395e0d16 /fs/f2fs
parent47b898081605684aa1bacd1d14443a50c660c1fe (diff)
f2fs: wait for discard completion after submission
We don't need to wait for each discard commands when unmounting the image. Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/segment.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 028db55375a4..df60e1502b82 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -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 list_head *wait_list = &(dcc->discard_cmd_list);
struct discard_cmd *dc, *tmp;
+ struct blk_plug plug;
mutex_lock(&dcc->cmd_lock);
+
+ blk_start_plug(&plug);
+
list_for_each_entry_safe(dc, tmp, wait_list, list) {
if (blkaddr == NULL_ADDR) {
@@ -686,9 +690,6 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
submit_bio(dc->bio);
atomic_inc(&dcc->submit_discard);
}
- wait_for_completion_io(&dc->wait);
-
- __remove_discard_cmd(sbi, dc);
continue;
}
@@ -699,6 +700,15 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
__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);
}