From 7e8f23081ab3a11de90d7389f2c6fd44676c8df9 Mon Sep 17 00:00:00 2001 From: Gu Zheng Date: Fri, 20 Dec 2013 18:17:49 +0800 Subject: f2fs: remove the rw_flag domain from f2fs_io_info When using the f2fs_io_info in the low level, we still need to merge the rw and rw_flag, so use the rw to hold all the io flags directly, and remove the rw_flag field. ps.It is based on the previous patch: f2fs: move all the bio initialization into __bio_alloc Signed-off-by: Gu Zheng Signed-off-by: Jaegeuk Kim --- fs/f2fs/data.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'fs/f2fs/data.c') diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 154a4f9..e46b5c5 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -105,7 +105,7 @@ static void __submit_merged_bio(struct f2fs_bio_info *io) if (!io->bio) return; - rw = fio->rw | fio->rw_flag; + rw = fio->rw; if (is_read_io(rw)) { trace_f2fs_submit_read_bio(io->sbi->sb, rw, @@ -760,7 +760,6 @@ static int f2fs_write_data_page(struct page *page, struct f2fs_io_info fio = { .type = DATA, .rw = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC: WRITE, - .rw_flag = 0, }; if (page->index < end_index) -- cgit v1.1