fs: have submit_bh users pass in op and flags separately

This has submit_bh users pass in the operation and flags separately,
so submit_bh_wbc can setup the bio op and bi_rw flags on the bio that
is submitted.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index eccb1c89ccbb..982d1e3df3a5 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -476,7 +476,8 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *btree, __u64 ptr,
         sector_t submit_ptr = 0;
         int ret;
 
-        ret = nilfs_btnode_submit_block(btnc, ptr, 0, READ, &bh, &submit_ptr);
+        ret = nilfs_btnode_submit_block(btnc, ptr, 0, REQ_OP_READ, 0, &bh,
+                                        &submit_ptr);
         if (ret) {
                 if (ret != -EEXIST)
                         return ret;
@@ -492,7 +493,8 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *btree, __u64 ptr,
                      n > 0 && i < ra->ncmax; n--, i++) {
                         ptr2 = nilfs_btree_node_get_ptr(ra->node, i, ra->ncmax);
 
-                        ret = nilfs_btnode_submit_block(btnc, ptr2, 0, READA,
+                        ret = nilfs_btnode_submit_block(btnc, ptr2, 0,
+                                                        REQ_OP_READ, REQ_RAHEAD,
                                                         &ra_bh, &submit_ptr);
                         if (likely(!ret || ret == -EEXIST))
                                 brelse(ra_bh);