diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-05-10 20:28:38 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-05-24 06:05:37 +0200 |
| commit | b9109b0e49b93b0ae663330acb36561b8f4f6905 (patch) | |
| tree | 5d0820e9a803266c902d4992453f4127464bcc2d /fs/f2fs/node.c | |
| parent | f2fs: use f2fs_submit_page_bio for ra_meta_pages (diff) | |
| download | linux-b9109b0e49b93b0ae663330acb36561b8f4f6905.tar.xz linux-b9109b0e49b93b0ae663330acb36561b8f4f6905.zip | |
f2fs: remove unnecessary read cases in merged IO flow
Merged IO flow doesn't need to care about read IOs.
f2fs_submit_merged_bio -> f2fs_submit_merged_write
f2fs_submit_merged_bios -> f2fs_submit_merged_writes
f2fs_submit_merged_bio_cond -> f2fs_submit_merged_write_cond
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/node.c')
| -rw-r--r-- | fs/f2fs/node.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 98351a4a4da3..41bb632ac2e0 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1373,15 +1373,15 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted, up_read(&sbi->node_write); if (wbc->for_reclaim) { - f2fs_submit_merged_bio_cond(sbi, page->mapping->host, 0, - page->index, NODE, WRITE); + f2fs_submit_merged_write_cond(sbi, page->mapping->host, 0, + page->index, NODE); submitted = NULL; } unlock_page(page); if (unlikely(f2fs_cp_error(sbi))) { - f2fs_submit_merged_bio(sbi, NODE, WRITE); + f2fs_submit_merged_write(sbi, NODE); submitted = NULL; } if (submitted) @@ -1518,8 +1518,7 @@ continue_unlock: } out: if (last_idx != ULONG_MAX) - f2fs_submit_merged_bio_cond(sbi, NULL, ino, last_idx, - NODE, WRITE); + f2fs_submit_merged_write_cond(sbi, NULL, ino, last_idx, NODE); return ret ? -EIO: 0; } @@ -1625,7 +1624,7 @@ continue_unlock: } out: if (nwritten) - f2fs_submit_merged_bio(sbi, NODE, WRITE); + f2fs_submit_merged_write(sbi, NODE); return ret; } |