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, 20 insertions, 13 deletions

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 160e1006640d..c1aaac431055 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -261,7 +261,7 @@ static void hib_end_io(struct bio *bio)
         bio_put(bio);
 }
 
-static int hib_submit_io(int rw, pgoff_t page_off, void *addr,
+static int hib_submit_io(int op, int op_flags, pgoff_t page_off, void *addr,
                 struct hib_bio_batch *hb)
 {
         struct page *page = virt_to_page(addr);
@@ -271,6 +271,7 @@ static int hib_submit_io(int rw, pgoff_t page_off, void *addr,
         bio = bio_alloc(__GFP_RECLAIM | __GFP_HIGH, 1);
         bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9);
         bio->bi_bdev = hib_resume_bdev;
+        bio_set_op_attrs(bio, op, op_flags);
 
         if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
                 printk(KERN_ERR "PM: Adding page to bio failed at %llu\n",
@@ -283,9 +284,9 @@ static int hib_submit_io(int rw, pgoff_t page_off, void *addr,
                 bio->bi_end_io = hib_end_io;
                 bio->bi_private = hb;
                 atomic_inc(&hb->count);
-                submit_bio(rw, bio);
+                submit_bio(bio);
         } else {
-                error = submit_bio_wait(rw, bio);
+                error = submit_bio_wait(bio);
                 bio_put(bio);
         }
 
@@ -306,7 +307,8 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags)
 {
         int error;
 
-        hib_submit_io(READ_SYNC, swsusp_resume_block, swsusp_header, NULL);
+        hib_submit_io(REQ_OP_READ, READ_SYNC, swsusp_resume_block,
+                      swsusp_header, NULL);
         if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
             !memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
                 memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
@@ -315,8 +317,8 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags)
                 swsusp_header->flags = flags;
                 if (flags & SF_CRC32_MODE)
                         swsusp_header->crc32 = handle->crc32;
-                error = hib_submit_io(WRITE_SYNC, swsusp_resume_block,
-                                        swsusp_header, NULL);
+                error = hib_submit_io(REQ_OP_WRITE, WRITE_SYNC,
+                                      swsusp_resume_block, swsusp_header, NULL);
         } else {
                 printk(KERN_ERR "PM: Swap header not found!\n");
                 error = -ENODEV;
@@ -389,7 +391,7 @@ static int write_page(void *buf, sector_t offset, struct hib_bio_batch *hb)
         } else {
                 src = buf;
         }
-        return hib_submit_io(WRITE_SYNC, offset, src, hb);
+        return hib_submit_io(REQ_OP_WRITE, WRITE_SYNC, offset, src, hb);
 }
 
 static void release_swap_writer(struct swap_map_handle *handle)
@@ -992,7 +994,8 @@ static int get_swap_reader(struct swap_map_handle *handle,
                         return -ENOMEM;
                 }
 
-                error = hib_submit_io(READ_SYNC, offset, tmp->map, NULL);
+                error = hib_submit_io(REQ_OP_READ, READ_SYNC, offset,
+                                      tmp->map, NULL);
                 if (error) {
                         release_swap_reader(handle);
                         return error;
@@ -1016,7 +1019,7 @@ static int swap_read_page(struct swap_map_handle *handle, void *buf,
         offset = handle->cur->entries[handle->k];
         if (!offset)
                 return -EFAULT;
-        error = hib_submit_io(READ_SYNC, offset, buf, hb);
+        error = hib_submit_io(REQ_OP_READ, READ_SYNC, offset, buf, hb);
         if (error)
                 return error;
         if (++handle->k >= MAP_PAGE_ENTRIES) {
@@ -1525,7 +1528,8 @@ int swsusp_check(void)
         if (!IS_ERR(hib_resume_bdev)) {
                 set_blocksize(hib_resume_bdev, PAGE_SIZE);
                 clear_page(swsusp_header);
-                error = hib_submit_io(READ_SYNC, swsusp_resume_block,
+                error = hib_submit_io(REQ_OP_READ, READ_SYNC,
+                                        swsusp_resume_block,
                                         swsusp_header, NULL);
                 if (error)
                         goto put;
@@ -1533,7 +1537,8 @@ int swsusp_check(void)
                 if (!memcmp(HIBERNATE_SIG, swsusp_header->sig, 10)) {
                         memcpy(swsusp_header->sig, swsusp_header->orig_sig, 10);
                         /* Reset swap signature now */
-                        error = hib_submit_io(WRITE_SYNC, swsusp_resume_block,
+                        error = hib_submit_io(REQ_OP_WRITE, WRITE_SYNC,
+                                                swsusp_resume_block,
                                                 swsusp_header, NULL);
                 } else {
                         error = -EINVAL;
@@ -1577,10 +1582,12 @@ int swsusp_unmark(void)
 {
         int error;
 
-        hib_submit_io(READ_SYNC, swsusp_resume_block, swsusp_header, NULL);
+        hib_submit_io(REQ_OP_READ, READ_SYNC, swsusp_resume_block,
+                      swsusp_header, NULL);
         if (!memcmp(HIBERNATE_SIG,swsusp_header->sig, 10)) {
                 memcpy(swsusp_header->sig,swsusp_header->orig_sig, 10);
-                error = hib_submit_io(WRITE_SYNC, swsusp_resume_block,
+                error = hib_submit_io(REQ_OP_WRITE, WRITE_SYNC,
+                                        swsusp_resume_block,
                                         swsusp_header, NULL);
         } else {
                 printk(KERN_ERR "PM: Cannot find swsusp signature!\n");