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
  ...

1 files changed, 36 insertions, 33 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 6c15012a75d9..e156a36463a1 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -45,7 +45,7 @@
 #include <trace/events/block.h>
 
 static int fsync_buffers_list(spinlock_t *lock, struct list_head *list);
-static int submit_bh_wbc(int rw, struct buffer_head *bh,
+static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
                          unsigned long bio_flags,
                          struct writeback_control *wbc);
 
@@ -588,7 +588,7 @@ void write_boundary_block(struct block_device *bdev,
         struct buffer_head *bh = __find_get_block(bdev, bblock + 1, blocksize);
         if (bh) {
                 if (buffer_dirty(bh))
-                        ll_rw_block(WRITE, 1, &bh);
+                        ll_rw_block(REQ_OP_WRITE, 0, 1, &bh);
                 put_bh(bh);
         }
 }
@@ -1225,7 +1225,7 @@ static struct buffer_head *__bread_slow(struct buffer_head *bh)
         } else {
                 get_bh(bh);
                 bh->b_end_io = end_buffer_read_sync;
-                submit_bh(READ, bh);
+                submit_bh(REQ_OP_READ, 0, bh);
                 wait_on_buffer(bh);
                 if (buffer_uptodate(bh))
                         return bh;
@@ -1395,7 +1395,7 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size)
 {
         struct buffer_head *bh = __getblk(bdev, block, size);
         if (likely(bh)) {
-                ll_rw_block(READA, 1, &bh);
+                ll_rw_block(REQ_OP_READ, READA, 1, &bh);
                 brelse(bh);
         }
 }
@@ -1697,7 +1697,7 @@ int __block_write_full_page(struct inode *inode, struct page *page,
         struct buffer_head *bh, *head;
         unsigned int blocksize, bbits;
         int nr_underway = 0;
-        int write_op = (wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC : WRITE);
+        int write_flags = (wbc->sync_mode == WB_SYNC_ALL ? WRITE_SYNC : 0);
 
         head = create_page_buffers(page, inode,
                                         (1 << BH_Dirty)|(1 << BH_Uptodate));
@@ -1786,7 +1786,7 @@ int __block_write_full_page(struct inode *inode, struct page *page,
         do {
                 struct buffer_head *next = bh->b_this_page;
                 if (buffer_async_write(bh)) {
-                        submit_bh_wbc(write_op, bh, 0, wbc);
+                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, 0, wbc);
                         nr_underway++;
                 }
                 bh = next;
@@ -1840,7 +1840,7 @@ recover:
                 struct buffer_head *next = bh->b_this_page;
                 if (buffer_async_write(bh)) {
                         clear_buffer_dirty(bh);
-                        submit_bh_wbc(write_op, bh, 0, wbc);
+                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, 0, wbc);
                         nr_underway++;
                 }
                 bh = next;
@@ -1956,7 +1956,7 @@ int __block_write_begin(struct page *page, loff_t pos, unsigned len,
                 if (!buffer_uptodate(bh) && !buffer_delay(bh) &&
                     !buffer_unwritten(bh) &&
                      (block_start < from || block_end > to)) {
-                        ll_rw_block(READ, 1, &bh);
+                        ll_rw_block(REQ_OP_READ, 0, 1, &bh);
                         *wait_bh++=bh;
                 }
         }
@@ -2249,7 +2249,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block)
                 if (buffer_uptodate(bh))
                         end_buffer_async_read(bh, 1);
                 else
-                        submit_bh(READ, bh);
+                        submit_bh(REQ_OP_READ, 0, bh);
         }
         return 0;
 }
@@ -2583,7 +2583,7 @@ int nobh_write_begin(struct address_space *mapping,
                 if (block_start < from || block_end > to) {
                         lock_buffer(bh);
                         bh->b_end_io = end_buffer_read_nobh;
-                        submit_bh(READ, bh);
+                        submit_bh(REQ_OP_READ, 0, bh);
                         nr_reads++;
                 }
         }
@@ -2853,7 +2853,7 @@ int block_truncate_page(struct address_space *mapping,
 
         if (!buffer_uptodate(bh) && !buffer_delay(bh) && !buffer_unwritten(bh)) {
                 err = -EIO;
-                ll_rw_block(READ, 1, &bh);
+                ll_rw_block(REQ_OP_READ, 0, 1, &bh);
                 wait_on_buffer(bh);
                 /* Uhhuh. Read error. Complain and punt. */
                 if (!buffer_uptodate(bh))
@@ -2950,7 +2950,7 @@ static void end_bio_bh_io_sync(struct bio *bio)
  * errors, this only handles the "we need to be able to
  * do IO at the final sector" case.
  */
-void guard_bio_eod(int rw, struct bio *bio)
+void guard_bio_eod(int op, struct bio *bio)
 {
         sector_t maxsector;
         struct bio_vec *bvec = &bio->bi_io_vec[bio->bi_vcnt - 1];
@@ -2980,13 +2980,13 @@ void guard_bio_eod(int rw, struct bio *bio)
         bvec->bv_len -= truncated_bytes;
 
         /* ..and clear the end of the buffer for reads */
-        if ((rw & RW_MASK) == READ) {
+        if (op == REQ_OP_READ) {
                 zero_user(bvec->bv_page, bvec->bv_offset + bvec->bv_len,
                                 truncated_bytes);
         }
 }
 
-static int submit_bh_wbc(int rw, struct buffer_head *bh,
+static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
                          unsigned long bio_flags, struct writeback_control *wbc)
 {
         struct bio *bio;
@@ -3000,7 +3000,7 @@ static int submit_bh_wbc(int rw, struct buffer_head *bh,
         /*
          * Only clear out a write error when rewriting
          */
-        if (test_set_buffer_req(bh) && (rw & WRITE))
+        if (test_set_buffer_req(bh) && (op == REQ_OP_WRITE))
                 clear_buffer_write_io_error(bh);
 
         /*
@@ -3025,32 +3025,35 @@ static int submit_bh_wbc(int rw, struct buffer_head *bh,
         bio->bi_flags |= bio_flags;
 
         /* Take care of bh's that straddle the end of the device */
-        guard_bio_eod(rw, bio);
+        guard_bio_eod(op, bio);
 
         if (buffer_meta(bh))
-                rw |= REQ_META;
+                op_flags |= REQ_META;
         if (buffer_prio(bh))
-                rw |= REQ_PRIO;
+                op_flags |= REQ_PRIO;
+        bio_set_op_attrs(bio, op, op_flags);
 
-        submit_bio(rw, bio);
+        submit_bio(bio);
         return 0;
 }
 
-int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags)
+int _submit_bh(int op, int op_flags, struct buffer_head *bh,
+               unsigned long bio_flags)
 {
-        return submit_bh_wbc(rw, bh, bio_flags, NULL);
+        return submit_bh_wbc(op, op_flags, bh, bio_flags, NULL);
 }
 EXPORT_SYMBOL_GPL(_submit_bh);
 
-int submit_bh(int rw, struct buffer_head *bh)
+int submit_bh(int op, int op_flags,  struct buffer_head *bh)
 {
-        return submit_bh_wbc(rw, bh, 0, NULL);
+        return submit_bh_wbc(op, op_flags, bh, 0, NULL);
 }
 EXPORT_SYMBOL(submit_bh);
 
 /**
  * ll_rw_block: low-level access to block devices (DEPRECATED)
- * @rw: whether to %READ or %WRITE or maybe %READA (readahead)
+ * @op: whether to %READ or %WRITE
+ * @op_flags: rq_flag_bits or %READA (readahead)
  * @nr: number of &struct buffer_heads in the array
  * @bhs: array of pointers to &struct buffer_head
  *
@@ -3073,7 +3076,7 @@ EXPORT_SYMBOL(submit_bh);
  * All of the buffers must be for the same device, and must also be a
  * multiple of the current approved size for the device.
  */
-void ll_rw_block(int rw, int nr, struct buffer_head *bhs[])
+void ll_rw_block(int op, int op_flags,  int nr, struct buffer_head *bhs[])
 {
         int i;
 
@@ -3082,18 +3085,18 @@ void ll_rw_block(int rw, int nr, struct buffer_head *bhs[])
 
                 if (!trylock_buffer(bh))
                         continue;
-                if (rw == WRITE) {
+                if (op == WRITE) {
                         if (test_clear_buffer_dirty(bh)) {
                                 bh->b_end_io = end_buffer_write_sync;
                                 get_bh(bh);
-                                submit_bh(WRITE, bh);
+                                submit_bh(op, op_flags, bh);
                                 continue;
                         }
                 } else {
                         if (!buffer_uptodate(bh)) {
                                 bh->b_end_io = end_buffer_read_sync;
                                 get_bh(bh);
-                                submit_bh(rw, bh);
+                                submit_bh(op, op_flags, bh);
                                 continue;
                         }
                 }
@@ -3102,7 +3105,7 @@ void ll_rw_block(int rw, int nr, struct buffer_head *bhs[])
 }
 EXPORT_SYMBOL(ll_rw_block);
 
-void write_dirty_buffer(struct buffer_head *bh, int rw)
+void write_dirty_buffer(struct buffer_head *bh, int op_flags)
 {
         lock_buffer(bh);
         if (!test_clear_buffer_dirty(bh)) {
@@ -3111,7 +3114,7 @@ void write_dirty_buffer(struct buffer_head *bh, int rw)
         }
         bh->b_end_io = end_buffer_write_sync;
         get_bh(bh);
-        submit_bh(rw, bh);
+        submit_bh(REQ_OP_WRITE, op_flags, bh);
 }
 EXPORT_SYMBOL(write_dirty_buffer);
 
@@ -3120,7 +3123,7 @@ EXPORT_SYMBOL(write_dirty_buffer);
  * and then start new I/O and then wait upon it.  The caller must have a ref on
  * the buffer_head.
  */
-int __sync_dirty_buffer(struct buffer_head *bh, int rw)
+int __sync_dirty_buffer(struct buffer_head *bh, int op_flags)
 {
         int ret = 0;
 
@@ -3129,7 +3132,7 @@ int __sync_dirty_buffer(struct buffer_head *bh, int rw)
         if (test_clear_buffer_dirty(bh)) {
                 get_bh(bh);
                 bh->b_end_io = end_buffer_write_sync;
-                ret = submit_bh(rw, bh);
+                ret = submit_bh(REQ_OP_WRITE, op_flags, bh);
                 wait_on_buffer(bh);
                 if (!ret && !buffer_uptodate(bh))
                         ret = -EIO;
@@ -3392,7 +3395,7 @@ int bh_submit_read(struct buffer_head *bh)
 
         get_bh(bh);
         bh->b_end_io = end_buffer_read_sync;
-        submit_bh(READ, bh);
+        submit_bh(REQ_OP_READ, 0, bh);
         wait_on_buffer(bh);
         if (buffer_uptodate(bh))
                 return 0;