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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user