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

Pull second round of block driver updates from Jens Axboe:
 "As mentioned in the original pull request, the bcache bits were pulled
  because of their dependency on the immutable bio vecs.  Kent re-did
  this part and resubmitted it, so here's the 2nd round of (mostly)
  driver updates for 3.13.  It contains:

 - The bcache work from Kent.

 - Conversion of virtio-blk to blk-mq.  This removes the bio and request
   path, and substitutes with the blk-mq path instead.  The end result
   almost 200 deleted lines.  Patch is acked by Asias and Christoph, who
   both did a bunch of testing.

 - A removal of bootmem.h include from Grygorii Strashko, part of a
   larger series of his killing the dependency on that header file.

 - Removal of __cpuinit from blk-mq from Paul Gortmaker"

* 'for-linus' of git://git.kernel.dk/linux-block: (56 commits)
  virtio_blk: blk-mq support
  blk-mq: remove newly added instances of __cpuinit
  bcache: defensively handle format strings
  bcache: Bypass torture test
  bcache: Delete some slower inline asm
  bcache: Use ida for bcache block dev minor
  bcache: Fix sysfs splat on shutdown with flash only devs
  bcache: Better full stripe scanning
  bcache: Have btree_split() insert into parent directly
  bcache: Move spinlock into struct time_stats
  bcache: Kill sequential_merge option
  bcache: Kill bch_next_recurse_key()
  bcache: Avoid deadlocking in garbage collection
  bcache: Incremental gc
  bcache: Add make_btree_freeing_key()
  bcache: Add btree_node_write_sync()
  bcache: PRECEDING_KEY()
  bcache: bch_(btree|extent)_ptr_invalid()
  bcache: Don't bother with bucket refcount for btree node allocations
  bcache: Debug code improvements
  ...

1 files changed, 37 insertions, 10 deletions

diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h
index 5ebda976ea93..e2b9576d00e2 100644
--- a/include/trace/events/bcache.h
+++ b/include/trace/events/bcache.h
@@ -6,11 +6,9 @@
 
 #include <linux/tracepoint.h>
 
-struct search;
-
 DECLARE_EVENT_CLASS(bcache_request,
-        TP_PROTO(struct search *s, struct bio *bio),
-        TP_ARGS(s, bio),
+        TP_PROTO(struct bcache_device *d, struct bio *bio),
+        TP_ARGS(d, bio),
 
         TP_STRUCT__entry(
                 __field(dev_t,          dev                     )
@@ -24,8 +22,8 @@ DECLARE_EVENT_CLASS(bcache_request,
 
         TP_fast_assign(
                 __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->orig_major     = s->d->disk->major;
-                __entry->orig_minor     = s->d->disk->first_minor;
+                __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;
@@ -79,13 +77,13 @@ DECLARE_EVENT_CLASS(btree_node,
 /* request.c */
 
 DEFINE_EVENT(bcache_request, bcache_request_start,
-        TP_PROTO(struct search *s, struct bio *bio),
-        TP_ARGS(s, bio)
+        TP_PROTO(struct bcache_device *d, struct bio *bio),
+        TP_ARGS(d, bio)
 );
 
 DEFINE_EVENT(bcache_request, bcache_request_end,
-        TP_PROTO(struct search *s, struct bio *bio),
-        TP_ARGS(s, bio)
+        TP_PROTO(struct bcache_device *d, struct bio *bio),
+        TP_ARGS(d, bio)
 );
 
 DECLARE_EVENT_CLASS(bcache_bio,
@@ -370,6 +368,35 @@ DEFINE_EVENT(btree_node, bcache_btree_set_root,
         TP_ARGS(b)
 );
 
+TRACE_EVENT(bcache_keyscan,
+        TP_PROTO(unsigned nr_found,
+                 unsigned start_inode, uint64_t start_offset,
+                 unsigned end_inode, uint64_t end_offset),
+        TP_ARGS(nr_found,
+                start_inode, start_offset,
+                end_inode, end_offset),
+
+        TP_STRUCT__entry(
+                __field(__u32,  nr_found                        )
+                __field(__u32,  start_inode                     )
+                __field(__u64,  start_offset                    )
+                __field(__u32,  end_inode                       )
+                __field(__u64,  end_offset                      )
+        ),
+
+        TP_fast_assign(
+                __entry->nr_found       = nr_found;
+                __entry->start_inode    = start_inode;
+                __entry->start_offset   = start_offset;
+                __entry->end_inode      = end_inode;
+                __entry->end_offset     = end_offset;
+        ),
+
+        TP_printk("found %u keys from %u:%llu to %u:%llu", __entry->nr_found,
+                  __entry->start_inode, __entry->start_offset,
+                  __entry->end_inode, __entry->end_offset)
+);
+
 /* Allocator */
 
 TRACE_EVENT(bcache_alloc_invalidate,