fs: have ll_rw_block users pass in op and flags separately

This has ll_rw_block users pass in the operation and flags separately,
so ll_rw_block 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>

2 files changed, 3 insertions, 3 deletions

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 2606de4fa661..34bc99637d5a 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1498,7 +1498,7 @@ static int journal_get_superblock(journal_t *journal)
 
         J_ASSERT(bh != NULL);
         if (!buffer_uptodate(bh)) {
-                ll_rw_block(READ, 1, &bh);
+                ll_rw_block(REQ_OP_READ, 0, 1, &bh);
                 wait_on_buffer(bh);
                 if (!buffer_uptodate(bh)) {
                         printk(KERN_ERR
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index 805bc6bcd8ab..02dd3360cb20 100644
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -104,7 +104,7 @@ static int do_readahead(journal_t *journal, unsigned int start)
                 if (!buffer_uptodate(bh) && !buffer_locked(bh)) {
                         bufs[nbufs++] = bh;
                         if (nbufs == MAXBUF) {
-                                ll_rw_block(READ, nbufs, bufs);
+                                ll_rw_block(REQ_OP_READ, 0, nbufs, bufs);
                                 journal_brelse_array(bufs, nbufs);
                                 nbufs = 0;
                         }
@@ -113,7 +113,7 @@ static int do_readahead(journal_t *journal, unsigned int start)
         }
 
         if (nbufs)
-                ll_rw_block(READ, nbufs, bufs);
+                ll_rw_block(REQ_OP_READ, 0, nbufs, bufs);
         err = 0;
 
 failed: