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

Pull core block IO changes from Jens Axboe:
 "The major piece in here is the immutable bio_ve series from Kent, the
  rest is fairly minor.  It was supposed to go in last round, but
  various issues pushed it to this release instead.  The pull request
  contains:

   - Various smaller blk-mq fixes from different folks.  Nothing major
     here, just minor fixes and cleanups.

   - Fix for a memory leak in the error path in the block ioctl code
     from Christian Engelmayer.

   - Header export fix from CaiZhiyong.

   - Finally the immutable biovec changes from Kent Overstreet.  This
     enables some nice future work on making arbitrarily sized bios
     possible, and splitting more efficient.  Related fixes to immutable
     bio_vecs:

        - dm-cache immutable fixup from Mike Snitzer.
        - btrfs immutable fixup from Muthu Kumar.

  - bio-integrity fix from Nic Bellinger, which is also going to stable"

* 'for-3.14/core' of git://git.kernel.dk/linux-block: (44 commits)
  xtensa: fixup simdisk driver to work with immutable bio_vecs
  block/blk-mq-cpu.c: use hotcpu_notifier()
  blk-mq: for_each_* macro correctness
  block: Fix memory leak in rw_copy_check_uvector() handling
  bio-integrity: Fix bio_integrity_verify segment start bug
  block: remove unrelated header files and export symbol
  blk-mq: uses page->list incorrectly
  blk-mq: use __smp_call_function_single directly
  btrfs: fix missing increment of bi_remaining
  Revert "block: Warn and free bio if bi_end_io is not set"
  block: Warn and free bio if bi_end_io is not set
  blk-mq: fix initializing request's start time
  block: blk-mq: don't export blk_mq_free_queue()
  block: blk-mq: make blk_sync_queue support mq
  block: blk-mq: support draining mq queue
  dm cache: increment bi_remaining when bi_end_io is restored
  block: fixup for generic bio chaining
  block: Really silence spurious compiler warnings
  block: Silence spurious compiler warnings
  block: Kill bio_pair_split()
  ...

3 files changed, 28 insertions, 28 deletions

diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h
index e2b9576d00e2..095c6e4fe1e8 100644
--- a/include/trace/events/bcache.h
+++ b/include/trace/events/bcache.h
@@ -24,10 +24,10 @@ DECLARE_EVENT_CLASS(bcache_request,
                 __entry->dev            = bio->bi_bdev->bd_dev;
                 __entry->orig_major     = d->disk->major;
                 __entry->orig_minor     = d->disk->first_minor;
-                __entry->sector         = bio->bi_sector;
-                __entry->orig_sector    = bio->bi_sector - 16;
-                __entry->nr_sector      = bio->bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                __entry->sector         = bio->bi_iter.bi_sector;
+                __entry->orig_sector    = bio->bi_iter.bi_sector - 16;
+                __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
         ),
 
         TP_printk("%d,%d %s %llu + %u (from %d,%d @ %llu)",
@@ -99,9 +99,9 @@ DECLARE_EVENT_CLASS(bcache_bio,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
-                __entry->nr_sector      = bio->bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                __entry->sector         = bio->bi_iter.bi_sector;
+                __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
         ),
 
         TP_printk("%d,%d  %s %llu + %u",
@@ -134,9 +134,9 @@ TRACE_EVENT(bcache_read,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
-                __entry->nr_sector      = bio->bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                __entry->sector         = bio->bi_iter.bi_sector;
+                __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
                 __entry->cache_hit = hit;
                 __entry->bypass = bypass;
         ),
@@ -162,9 +162,9 @@ TRACE_EVENT(bcache_write,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
-                __entry->nr_sector      = bio->bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                __entry->sector         = bio->bi_iter.bi_sector;
+                __entry->nr_sector      = bio->bi_iter.bi_size >> 9;
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
                 __entry->writeback = writeback;
                 __entry->bypass = bypass;
         ),
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 4c2301d2ef1a..e76ae19a8d6f 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -243,9 +243,9 @@ TRACE_EVENT(block_bio_bounce,
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev ?
                                           bio->bi_bdev->bd_dev : 0;
-                __entry->sector         = bio->bi_sector;
+                __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
 
@@ -280,10 +280,10 @@ TRACE_EVENT(block_bio_complete,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
+                __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
                 __entry->error          = error;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
         ),
 
         TP_printk("%d,%d %s %llu + %u [%d]",
@@ -308,9 +308,9 @@ DECLARE_EVENT_CLASS(block_bio_merge,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
+                __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
 
@@ -375,9 +375,9 @@ TRACE_EVENT(block_bio_queue,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
+                __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
 
@@ -403,7 +403,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
 
         TP_fast_assign(
                 __entry->dev            = bio ? bio->bi_bdev->bd_dev : 0;
-                __entry->sector         = bio ? bio->bi_sector : 0;
+                __entry->sector         = bio ? bio->bi_iter.bi_sector : 0;
                 __entry->nr_sector      = bio ? bio_sectors(bio) : 0;
                 blk_fill_rwbs(__entry->rwbs,
                               bio ? bio->bi_rw : 0, __entry->nr_sector);
@@ -538,9 +538,9 @@ TRACE_EVENT(block_split,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
+                __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->new_sector     = new_sector;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
                 memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
         ),
 
@@ -579,11 +579,11 @@ TRACE_EVENT(block_bio_remap,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
+                __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->nr_sector      = bio_sectors(bio);
                 __entry->old_dev        = dev;
                 __entry->old_sector     = from;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
+                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_iter.bi_size);
         ),
 
         TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 3b9f28dfc849..67f38faac589 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -629,8 +629,8 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio,
                 __entry->dev            = sb->s_dev;
                 __entry->rw             = rw;
                 __entry->type           = type;
-                __entry->sector         = bio->bi_sector;
-                __entry->size           = bio->bi_size;
+                __entry->sector         = bio->bi_iter.bi_sector;
+                __entry->size           = bio->bi_iter.bi_size;
         ),
 
         TP_printk("dev = (%d,%d), %s%s, %s, sector = %lld, size = %u",