Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

Pull core block updates from Jens Axboe:

   - the big change is the cleanup from Mike Christie, cleaning up our
     uses of command types and modified flags.  This is what will throw
     some merge conflicts

   - regression fix for the above for btrfs, from Vincent

   - following up to the above, better packing of struct request from
     Christoph

   - a 2038 fix for blktrace from Arnd

   - a few trivial/spelling fixes from Bart Van Assche

   - a front merge check fix from Damien, which could cause issues on
     SMR drives

   - Atari partition fix from Gabriel

   - convert cfq to highres timers, since jiffies isn't granular enough
     for some devices these days.  From Jan and Jeff

   - CFQ priority boost fix idle classes, from me

   - cleanup series from Ming, improving our bio/bvec iteration

   - a direct issue fix for blk-mq from Omar

   - fix for plug merging not involving the IO scheduler, like we do for
     other types of merges.  From Tahsin

   - expose DAX type internally and through sysfs.  From Toshi and Yigal

* 'for-4.8/core' of git://git.kernel.dk/linux-block: (76 commits)
  block: Fix front merge check
  block: do not merge requests without consulting with io scheduler
  block: Fix spelling in a source code comment
  block: expose QUEUE_FLAG_DAX in sysfs
  block: add QUEUE_FLAG_DAX for devices to advertise their DAX support
  Btrfs: fix comparison in __btrfs_map_block()
  block: atari: Return early for unsupported sector size
  Doc: block: Fix a typo in queue-sysfs.txt
  cfq-iosched: Charge at least 1 jiffie instead of 1 ns
  cfq-iosched: Fix regression in bonnie++ rewrite performance
  cfq-iosched: Convert slice_resid from u64 to s64
  block: Convert fifo_time from ulong to u64
  blktrace: avoid using timespec
  block/blk-cgroup.c: Declare local symbols static
  block/bio-integrity.c: Add #include "blk.h"
  block/partition-generic.c: Remove a set-but-not-used variable
  block: bio: kill BIO_MAX_SIZE
  cfq-iosched: temporarily boost queue priority for idle classes
  block: drbd: avoid to use BIO_MAX_SIZE
  block: bio: remove BIO_MAX_SECTORS
  ...

4 files changed, 12 insertions, 12 deletions

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 825455d3e4ba..c2c59f9ff04b 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -2668,7 +2668,7 @@ static int reiserfs_write_full_page(struct page *page,
         do {
                 struct buffer_head *next = bh->b_this_page;
                 if (buffer_async_write(bh)) {
-                        submit_bh(WRITE, bh);
+                        submit_bh(REQ_OP_WRITE, 0, bh);
                         nr++;
                 }
                 put_bh(bh);
@@ -2728,7 +2728,7 @@ fail:
                 struct buffer_head *next = bh->b_this_page;
                 if (buffer_async_write(bh)) {
                         clear_buffer_dirty(bh);
-                        submit_bh(WRITE, bh);
+                        submit_bh(REQ_OP_WRITE, 0, bh);
                         nr++;
                 }
                 put_bh(bh);
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 2ace90e981f0..bc2dde2423c2 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -652,7 +652,7 @@ static void submit_logged_buffer(struct buffer_head *bh)
                 BUG();
         if (!buffer_uptodate(bh))
                 BUG();
-        submit_bh(WRITE, bh);
+        submit_bh(REQ_OP_WRITE, 0, bh);
 }
 
 static void submit_ordered_buffer(struct buffer_head *bh)
@@ -662,7 +662,7 @@ static void submit_ordered_buffer(struct buffer_head *bh)
         clear_buffer_dirty(bh);
         if (!buffer_uptodate(bh))
                 BUG();
-        submit_bh(WRITE, bh);
+        submit_bh(REQ_OP_WRITE, 0, bh);
 }
 
 #define CHUNK_SIZE 32
@@ -870,7 +870,7 @@ loop_next:
                  */
                 if (buffer_dirty(bh) && unlikely(bh->b_page->mapping == NULL)) {
                         spin_unlock(lock);
-                        ll_rw_block(WRITE, 1, &bh);
+                        ll_rw_block(REQ_OP_WRITE, 0, 1, &bh);
                         spin_lock(lock);
                 }
                 put_bh(bh);
@@ -1057,7 +1057,7 @@ static int flush_commit_list(struct super_block *s,
                 if (tbh) {
                         if (buffer_dirty(tbh)) {
                             depth = reiserfs_write_unlock_nested(s);
-                            ll_rw_block(WRITE, 1, &tbh);
+                            ll_rw_block(REQ_OP_WRITE, 0, 1, &tbh);
                             reiserfs_write_lock_nested(s, depth);
                         }
                         put_bh(tbh) ;
@@ -2244,7 +2244,7 @@ abort_replay:
                 }
         }
         /* read in the log blocks, memcpy to the corresponding real block */
-        ll_rw_block(READ, get_desc_trans_len(desc), log_blocks);
+        ll_rw_block(REQ_OP_READ, 0, get_desc_trans_len(desc), log_blocks);
         for (i = 0; i < get_desc_trans_len(desc); i++) {
 
                 wait_on_buffer(log_blocks[i]);
@@ -2269,7 +2269,7 @@ abort_replay:
         /* flush out the real blocks */
         for (i = 0; i < get_desc_trans_len(desc); i++) {
                 set_buffer_dirty(real_blocks[i]);
-                write_dirty_buffer(real_blocks[i], WRITE);
+                write_dirty_buffer(real_blocks[i], 0);
         }
         for (i = 0; i < get_desc_trans_len(desc); i++) {
                 wait_on_buffer(real_blocks[i]);
@@ -2346,7 +2346,7 @@ static struct buffer_head *reiserfs_breada(struct block_device *dev,
                 } else
                         bhlist[j++] = bh;
         }
-        ll_rw_block(READ, j, bhlist);
+        ll_rw_block(REQ_OP_READ, 0, j, bhlist);
         for (i = 1; i < j; i++)
                 brelse(bhlist[i]);
         bh = bhlist[0];
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 5feacd689241..64b29b592d86 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -551,7 +551,7 @@ static int search_by_key_reada(struct super_block *s,
                 if (!buffer_uptodate(bh[j])) {
                         if (depth == -1)
                                 depth = reiserfs_write_unlock_nested(s);
-                        ll_rw_block(READA, 1, bh + j);
+                        ll_rw_block(REQ_OP_READ, READA, 1, bh + j);
                 }
                 brelse(bh[j]);
         }
@@ -660,7 +660,7 @@ int search_by_key(struct super_block *sb, const struct cpu_key *key,
                         if (!buffer_uptodate(bh) && depth == -1)
                                 depth = reiserfs_write_unlock_nested(sb);
 
-                        ll_rw_block(READ, 1, &bh);
+                        ll_rw_block(REQ_OP_READ, 0, 1, &bh);
                         wait_on_buffer(bh);
 
                         if (depth != -1)
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index c72c16c5a60f..7a4a85a6821e 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1666,7 +1666,7 @@ static int read_super_block(struct super_block *s, int offset)
 /* after journal replay, reread all bitmap and super blocks */
 static int reread_meta_blocks(struct super_block *s)
 {
-        ll_rw_block(READ, 1, &SB_BUFFER_WITH_SB(s));
+        ll_rw_block(REQ_OP_READ, 0, 1, &SB_BUFFER_WITH_SB(s));
         wait_on_buffer(SB_BUFFER_WITH_SB(s));
         if (!buffer_uptodate(SB_BUFFER_WITH_SB(s))) {
                 reiserfs_warning(s, "reiserfs-2504", "error reading the super");