mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

f2fs: drop any block plugging

Browse source 
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>
This commit is contained in:
Jaegeuk Kim 2016-06-04 14:25:24 -07:00
parent 7dfeaa3220
commit 19a5f5e2ef
4 changed files with 11 additions and 22 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
fs/f2fs/checkpoint.c
View file

@ -897,11 +897,8 @@ static int block_operations(struct f2fs_sb_info *sbi)
.nr_to_write = LONG_MAX, .nr_to_write = LONG_MAX,
.for_reclaim = 0, .for_reclaim = 0,
}; };
struct blk_plug plug;
int err = 0; int err = 0;
blk_start_plug(&plug);
retry_flush_dents: retry_flush_dents:
f2fs_lock_all(sbi); f2fs_lock_all(sbi);
/* write all the dirty dentry pages */ /* write all the dirty dentry pages */
@ -938,7 +935,6 @@ static int block_operations(struct f2fs_sb_info *sbi)
goto retry_flush_nodes; goto retry_flush_nodes;
} }
out: out:
blk_finish_plug(&plug);
return err; return err;
} }

17
fs/f2fs/data.c
View file

@ -98,10 +98,13 @@ static struct bio *__bio_alloc(struct f2fs_sb_info *sbi, block_t blk_addr,
} }
static inline void __submit_bio(struct f2fs_sb_info *sbi, int rw, 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); atomic_inc(&sbi->nr_wb_bios);
if (current->plug && (type == DATA || type == NODE))
blk_finish_plug(current->plug);
}
submit_bio(rw, bio); submit_bio(rw, bio);
} }
@ -117,7 +120,7 @@ static void __submit_merged_bio(struct f2fs_bio_info *io)
else else
trace_f2fs_submit_write_bio(io->sbi->sb, fio, io->bio); 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; io->bio = NULL;
} }
@ -235,7 +238,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
return -EFAULT; return -EFAULT;
} }
__submit_bio(fio->sbi, fio->rw, bio); __submit_bio(fio->sbi, fio->rw, bio, fio->type);
return 0; return 0;
} }
@ -1040,7 +1043,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,
*/ */
if (bio && (last_block_in_bio != block_nr - 1)) { if (bio && (last_block_in_bio != block_nr - 1)) {
submit_and_realloc: submit_and_realloc:
__submit_bio(F2FS_I_SB(inode), READ, bio); __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
bio = NULL; bio = NULL;
} }
if (bio == NULL) { if (bio == NULL) {
@ -1083,7 +1086,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,
goto next_page; goto next_page;
confused: confused:
if (bio) { if (bio) {
__submit_bio(F2FS_I_SB(inode), READ, bio); __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
bio = NULL; bio = NULL;
} }
unlock_page(page); unlock_page(page);
@ -1093,7 +1096,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping,
} }
BUG_ON(pages && !list_empty(pages)); BUG_ON(pages && !list_empty(pages));
if (bio) if (bio)
__submit_bio(F2FS_I_SB(inode), READ, bio); __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
return 0; return 0;
} }

5
fs/f2fs/gc.c
View file

@ -777,7 +777,6 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
{ {
struct page *sum_page; struct page *sum_page;
struct f2fs_summary_block *sum; struct f2fs_summary_block *sum;
struct blk_plug plug;
unsigned int segno = start_segno; unsigned int segno = start_segno;
unsigned int end_segno = start_segno + sbi->segs_per_sec; unsigned int end_segno = start_segno + sbi->segs_per_sec;
int seg_freed = 0; int seg_freed = 0;
@ -795,8 +794,6 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
unlock_page(sum_page); unlock_page(sum_page);
} }
blk_start_plug(&plug);
for (segno = start_segno; segno < end_segno; segno++) { for (segno = start_segno; segno < end_segno; segno++) {
/* find segment summary of victim */ /* find segment summary of victim */
sum_page = find_get_page(META_MAPPING(sbi), sum_page = find_get_page(META_MAPPING(sbi),
@ -830,8 +827,6 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
f2fs_submit_merged_bio(sbi, f2fs_submit_merged_bio(sbi,
(type == SUM_TYPE_NODE) ? NODE : DATA, WRITE); (type == SUM_TYPE_NODE) ? NODE : DATA, WRITE);
blk_finish_plug(&plug);
if (gc_type == FG_GC) { if (gc_type == FG_GC) {
while (start_segno < end_segno) while (start_segno < end_segno)
if (get_valid_blocks(sbi, start_segno++, 1) == 0) if (get_valid_blocks(sbi, start_segno++, 1) == 0)

7
fs/f2fs/segment.c
View file

@ -379,13 +379,8 @@ void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi)
excess_prefree_segs(sbi) || excess_prefree_segs(sbi) ||
excess_dirty_nats(sbi) || excess_dirty_nats(sbi) ||
(is_idle(sbi) && f2fs_time_over(sbi, CP_TIME))) { (is_idle(sbi) && f2fs_time_over(sbi, CP_TIME))) {
if (test_opt(sbi, DATA_FLUSH)) { if (test_opt(sbi, DATA_FLUSH))
struct blk_plug plug;
blk_start_plug(&plug);
sync_dirty_inodes(sbi, FILE_INODE); sync_dirty_inodes(sbi, FILE_INODE);
blk_finish_plug(&plug);
}
f2fs_sync_fs(sbi->sb, true); f2fs_sync_fs(sbi->sb, true);
stat_inc_bg_cp_count(sbi->stat_info); stat_inc_bg_cp_count(sbi->stat_info);
} }