f2fs: introduce f2fs_wait_discard_bios

Split f2fs_wait_discard_bios from f2fs_wait_discard_bio, just for cleanup,
no logic change.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 55a050668d00bd36f19404a11000e3cb2c1cec2b..7321f061bb289c6d8b0ff6d0e04fe700b695588a 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2193,7 +2193,7 @@ void destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free);
 void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr);
 bool is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr);
 void refresh_sit_entry(struct f2fs_sb_info *sbi, block_t old, block_t new);
-void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr);
+void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi);
 void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc);
 void release_discard_addrs(struct f2fs_sb_info *sbi);
 int npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra);

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 1a5b3e4770d2324604b3ae68316bc51e6f73066b..a27dd167999144464434a79366fdad30c9f2fdf7 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -797,13 +797,9 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
        struct list_head *pend_list = &(dcc->discard_pend_list);
        struct list_head *wait_list = &(dcc->discard_wait_list);
        struct discard_cmd *dc, *tmp;
-       struct blk_plug plug;
 
        mutex_lock(&dcc->cmd_lock);
 
-       if (blkaddr == NULL_ADDR)
-               goto release_discard;
-
        list_for_each_entry_safe(dc, tmp, pend_list, list) {
                if (dc->lstart <= blkaddr && blkaddr < dc->lstart + dc->len)
                        __punch_discard_cmd(sbi, dc, blkaddr);
@@ -817,19 +813,30 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
                }
        }
 
-release_discard:
-       /* this comes from f2fs_put_super */
-       if (blkaddr == NULL_ADDR) {
-               blk_start_plug(&plug);
-               list_for_each_entry_safe(dc, tmp, pend_list, list)
-                       __submit_discard_cmd(sbi, dc);
-               blk_finish_plug(&plug);
+       mutex_unlock(&dcc->cmd_lock);
+}
 
-               list_for_each_entry_safe(dc, tmp, wait_list, list) {
-                       wait_for_completion_io(&dc->wait);
-                       __remove_discard_cmd(sbi, dc);
-               }
+/* This comes from f2fs_put_super */
+void f2fs_wait_discard_bios(struct f2fs_sb_info *sbi)
+{
+       struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+       struct list_head *pend_list = &(dcc->discard_pend_list);
+       struct list_head *wait_list = &(dcc->discard_wait_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, pend_list, list)
+               __submit_discard_cmd(sbi, dc);
+       blk_finish_plug(&plug);
+
+       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);
 }
 

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 21d5eaa2793e70ee2ac333f4c60e370b0ea20b36..cb65e6d0d275ed3d9cb262256c5c500d1ba3d4d7 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -795,7 +795,7 @@ static void f2fs_put_super(struct super_block *sb)
        }
 
        /* be sure to wait for any on-going discard commands */
-       f2fs_wait_discard_bio(sbi, NULL_ADDR);
+       f2fs_wait_discard_bios(sbi);
 
        /* write_checkpoint can update stat informaion */
        f2fs_destroy_stats(sbi);