f2fs: drop any block plugging
In f2fs, we don't need to keep block plugging for NODE and DATA writes, since
we already merged bios as much as possible.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index bfa86ad..de1d9b1 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -898,11 +898,8 @@
.nr_to_write = LONG_MAX,
.for_reclaim = 0,
};
- struct blk_plug plug;
int err = 0;
- blk_start_plug(&plug);
-
retry_flush_dents:
f2fs_lock_all(sbi);
/* write all the dirty dentry pages */
@@ -939,7 +936,6 @@
goto retry_flush_nodes;
}
out:
- blk_finish_plug(&plug);
return err;
}
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5d75854..468fc3d 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -99,10 +99,13 @@
}
static inline void __submit_bio(struct f2fs_sb_info *sbi, int rw,
- struct bio *bio)
+ struct bio *bio, enum page_type type)
{
- if (!is_read_io(rw))
+ if (!is_read_io(rw)) {
atomic_inc(&sbi->nr_wb_bios);
+ if (current->plug && (type == DATA || type == NODE))
+ blk_finish_plug(current->plug);
+ }
submit_bio(rw, bio);
}
@@ -118,7 +121,7 @@
else
trace_f2fs_submit_write_bio(io->sbi->sb, fio, io->bio);
- __submit_bio(io->sbi, fio->rw, io->bio);
+ __submit_bio(io->sbi, fio->rw, io->bio, fio->type);
io->bio = NULL;
}
@@ -236,7 +239,7 @@
return -EFAULT;
}
- __submit_bio(fio->sbi, fio->rw, bio);
+ __submit_bio(fio->sbi, fio->rw, bio, fio->type);
return 0;
}
@@ -1040,7 +1043,7 @@
*/
if (bio && (last_block_in_bio != block_nr - 1)) {
submit_and_realloc:
- __submit_bio(F2FS_I_SB(inode), READ, bio);
+ __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
bio = NULL;
}
if (bio == NULL) {
@@ -1083,7 +1086,7 @@
goto next_page;
confused:
if (bio) {
- __submit_bio(F2FS_I_SB(inode), READ, bio);
+ __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
bio = NULL;
}
unlock_page(page);
@@ -1093,7 +1096,7 @@
}
BUG_ON(pages && !list_empty(pages));
if (bio)
- __submit_bio(F2FS_I_SB(inode), READ, bio);
+ __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
return 0;
}
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 621cd59..fdb347d 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -777,7 +777,6 @@
{
struct page *sum_page;
struct f2fs_summary_block *sum;
- struct blk_plug plug;
unsigned int segno = start_segno;
unsigned int end_segno = start_segno + sbi->segs_per_sec;
int seg_freed = 0;
@@ -795,8 +794,6 @@
unlock_page(sum_page);
}
- blk_start_plug(&plug);
-
for (segno = start_segno; segno < end_segno; segno++) {
/* find segment summary of victim */
sum_page = find_get_page(META_MAPPING(sbi),
@@ -830,8 +827,6 @@
f2fs_submit_merged_bio(sbi,
(type == SUM_TYPE_NODE) ? NODE : DATA, WRITE);
- blk_finish_plug(&plug);
-
if (gc_type == FG_GC) {
while (start_segno < end_segno)
if (get_valid_blocks(sbi, start_segno++, 1) == 0)
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 7e79f78c..a5c27c0 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -438,13 +438,8 @@
excess_prefree_segs(sbi) ||
excess_dirty_nats(sbi) ||
(is_idle(sbi) && f2fs_time_over(sbi, CP_TIME))) {
- if (test_opt(sbi, DATA_FLUSH)) {
- struct blk_plug plug;
-
- blk_start_plug(&plug);
+ if (test_opt(sbi, DATA_FLUSH))
sync_dirty_inodes(sbi, FILE_INODE);
- blk_finish_plug(&plug);
- }
f2fs_sync_fs(sbi->sb, true);
stat_inc_bg_cp_count(sbi->stat_info);
}