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>

2 files changed, 7 insertions, 7 deletions

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 70078096117d..8f7d1339c973 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -155,9 +155,9 @@ static int journal_submit_commit_record(journal_t *journal,
 
         if (journal->j_flags & JBD2_BARRIER &&
             !jbd2_has_feature_async_commit(journal))
-                ret = submit_bh(WRITE_SYNC | WRITE_FLUSH_FUA, bh);
+                ret = submit_bh(REQ_OP_WRITE, WRITE_SYNC | WRITE_FLUSH_FUA, bh);
         else
-                ret = submit_bh(WRITE_SYNC, bh);
+                ret = submit_bh(REQ_OP_WRITE, WRITE_SYNC, bh);
 
         *cbh = bh;
         return ret;
@@ -718,7 +718,7 @@ start_journal_io:
                                 clear_buffer_dirty(bh);
                                 set_buffer_uptodate(bh);
                                 bh->b_end_io = journal_end_buffer_io_sync;
-                                submit_bh(WRITE_SYNC, bh);
+                                submit_bh(REQ_OP_WRITE, WRITE_SYNC, bh);
                         }
                         cond_resched();
                         stats.run.rs_blocks_logged += bufs;
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index b31852f76f46..2606de4fa661 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1346,15 +1346,15 @@ static int journal_reset(journal_t *journal)
         return jbd2_journal_start_thread(journal);
 }
 
-static int jbd2_write_superblock(journal_t *journal, int write_op)
+static int jbd2_write_superblock(journal_t *journal, int write_flags)
 {
         struct buffer_head *bh = journal->j_sb_buffer;
         journal_superblock_t *sb = journal->j_superblock;
         int ret;
 
-        trace_jbd2_write_superblock(journal, write_op);
+        trace_jbd2_write_superblock(journal, write_flags);
         if (!(journal->j_flags & JBD2_BARRIER))
-                write_op &= ~(REQ_FUA | REQ_FLUSH);
+                write_flags &= ~(REQ_FUA | REQ_FLUSH);
         lock_buffer(bh);
         if (buffer_write_io_error(bh)) {
                 /*
@@ -1374,7 +1374,7 @@ static int jbd2_write_superblock(journal_t *journal, int write_op)
         jbd2_superblock_csum_set(journal, sb);
         get_bh(bh);
         bh->b_end_io = end_buffer_write_sync;
-        ret = submit_bh(write_op, bh);
+        ret = submit_bh(REQ_OP_WRITE, write_flags, bh);
         wait_on_buffer(bh);
         if (buffer_write_io_error(bh)) {
                 clear_buffer_write_io_error(bh);