diff options
| author | Gu Zheng <guz.fnst@cn.fujitsu.com> | 2013-12-20 18:17:49 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-12-23 10:18:07 +0900 |
| commit | 7e8f23081ab3a11de90d7389f2c6fd44676c8df9 (patch) | |
| tree | 6570134b285d7e62c55c175fcb8ea9c1e1dbd912 /fs/f2fs/node.c | |
| parent | 940a6d34b31b96f0748a4b688a551a0890b2b229 (diff) | |
| download | linux-stable-7e8f23081ab3a11de90d7389f2c6fd44676c8df9.tar.gz linux-stable-7e8f23081ab3a11de90d7389f2c6fd44676c8df9.tar.bz2 linux-stable-7e8f23081ab3a11de90d7389f2c6fd44676c8df9.zip | |
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 <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs/node.c')
| -rw-r--r-- | fs/f2fs/node.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 3565caf97005..0af0a715e367 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -94,8 +94,7 @@ static void ra_nat_pages(struct f2fs_sb_info *sbi, int nid) int i; struct f2fs_io_info fio = { .type = META, - .rw = READ_SYNC, - .rw_flag = REQ_META | REQ_PRIO + .rw = READ_SYNC | REQ_META | REQ_PRIO }; @@ -1581,8 +1580,7 @@ static int ra_sum_pages(struct f2fs_sb_info *sbi, struct list_head *pages, int page_idx = start; struct f2fs_io_info fio = { .type = META, - .rw = READ_SYNC, - .rw_flag = REQ_META | REQ_PRIO + .rw = READ_SYNC | REQ_META | REQ_PRIO }; for (; page_idx < start + nrpages; page_idx++) { |