[PATCH v3 2/4] f2fs: introduce f2fs_wait_discard_bios

[Chao Yu]

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

Signed-off-by: Chao Yu 
Signed-off-by: Jaegeuk Kim 
---
 fs/f2fs/f2fs.h|  2 +-
 fs/f2fs/segment.c | 37 ++---
 fs/f2fs/super.c   |  2 +-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 68e55bd6b50e..33073bd1f090 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2187,7 +2187,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 07dddcb0d03d..4243c7539f42 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -786,13 +786,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(>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);
@@ -806,19 +802,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();
-   list_for_each_entry_safe(dc, tmp, pend_list, list)
-   __submit_discard_cmd(sbi, dc);
-   blk_finish_plug();
+   mutex_unlock(>cmd_lock);
+}
 
-   list_for_each_entry_safe(dc, tmp, wait_list, list) {
-   wait_for_completion_io(>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(>cmd_lock);
+
+   blk_start_plug();
+   list_for_each_entry_safe(dc, tmp, pend_list, list)
+   __submit_discard_cmd(sbi, dc);
+   blk_finish_plug();
+
+   list_for_each_entry_safe(dc, tmp, wait_list, list) {
+   wait_for_completion_io(>wait);
+   __remove_discard_cmd(sbi, dc);
}
+
mutex_unlock(>cmd_lock);
 }
 
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index f315b54cd840..b4c5c6298698 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -793,7 +793,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);
-- 
2.12.2.510.ge1104a5ee539

[PATCH v3 2/4] f2fs: introduce f2fs_wait_discard_bios

[Chao Yu]

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

Signed-off-by: Chao Yu 
Signed-off-by: Jaegeuk Kim 
---
 fs/f2fs/f2fs.h|  2 +-
 fs/f2fs/segment.c | 37 ++---
 fs/f2fs/super.c   |  2 +-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 68e55bd6b50e..33073bd1f090 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2187,7 +2187,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 07dddcb0d03d..4243c7539f42 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -786,13 +786,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(>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);
@@ -806,19 +802,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();
-   list_for_each_entry_safe(dc, tmp, pend_list, list)
-   __submit_discard_cmd(sbi, dc);
-   blk_finish_plug();
+   mutex_unlock(>cmd_lock);
+}
 
-   list_for_each_entry_safe(dc, tmp, wait_list, list) {
-   wait_for_completion_io(>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(>cmd_lock);
+
+   blk_start_plug();
+   list_for_each_entry_safe(dc, tmp, pend_list, list)
+   __submit_discard_cmd(sbi, dc);
+   blk_finish_plug();
+
+   list_for_each_entry_safe(dc, tmp, wait_list, list) {
+   wait_for_completion_io(>wait);
+   __remove_discard_cmd(sbi, dc);
}
+
mutex_unlock(>cmd_lock);
 }
 
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index f315b54cd840..b4c5c6298698 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -793,7 +793,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);
-- 
2.12.2.510.ge1104a5ee539