block,fs: use REQ_* flags directly

[linux-block.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 9ae194fd2fdb81cbc54bfed9220da527d6b21a89..b80bf10603d74821588ca5122e64c206036dc1a9 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -198,11 +198,9 @@ static void __f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
        if (type >= META_FLUSH) {
                io->fio.type = META_FLUSH;
                io->fio.op = REQ_OP_WRITE;
-               if (test_opt(sbi, NOBARRIER))
-                       io->fio.op_flags = WRITE_FLUSH | REQ_META | REQ_PRIO;
-               else
-                       io->fio.op_flags = WRITE_FLUSH_FUA | REQ_META |
-                                                               REQ_PRIO;
+               io->fio.op_flags = REQ_PREFLUSH | REQ_META | REQ_PRIO;
+               if (!test_opt(sbi, NOBARRIER))
+                       io->fio.op_flags |= REQ_FUA;
        }
        __submit_merged_bio(io);
 out:
@@ -483,7 +481,7 @@ struct page *find_data_page(struct inode *inode, pgoff_t index)
                return page;
        f2fs_put_page(page, 0);
 
-       page = get_read_data_page(inode, index, READ_SYNC, false);
+       page = get_read_data_page(inode, index, 0, false);
        if (IS_ERR(page))
                return page;
 
@@ -509,7 +507,7 @@ struct page *get_lock_data_page(struct inode *inode, pgoff_t index,
        struct address_space *mapping = inode->i_mapping;
        struct page *page;
 repeat:
-       page = get_read_data_page(inode, index, READ_SYNC, for_write);
+       page = get_read_data_page(inode, index, 0, for_write);
        if (IS_ERR(page))
                return page;
 
@@ -1251,7 +1249,7 @@ static int f2fs_write_data_page(struct page *page,
                .sbi = sbi,
                .type = DATA,
                .op = REQ_OP_WRITE,
-               .op_flags = (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : 0,
+               .op_flags = (wbc->sync_mode == WB_SYNC_ALL) ? REQ_SYNC : 0,
                .page = page,
                .encrypted_page = NULL,
        };
@@ -1663,7 +1661,7 @@ repeat:
                        err = PTR_ERR(bio);
                        goto fail;
                }
-               bio_set_op_attrs(bio, REQ_OP_READ, READ_SYNC);
+               bio->bi_opf = REQ_OP_READ;
                if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
                        bio_put(bio);
                        err = -EFAULT;