Merge remote-tracking branch 'dma-buf/for-next'

[karo-tx-linux.git] / block / blk-mq.h

diff --git a/block/blk-mq.h b/block/blk-mq.h
index ebbe6bac9d616d4a47a815870dc9d3682403c9d1..7db4fe4bd0021434246912ef9cdcbd1020e15e5d 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -1,6 +1,8 @@
 #ifndef INT_BLK_MQ_H
 #define INT_BLK_MQ_H
 
+struct blk_mq_tag_set;
+
 struct blk_mq_ctx {
        struct {
                spinlock_t              lock;
@@ -9,7 +11,8 @@ struct blk_mq_ctx {
 
        unsigned int            cpu;
        unsigned int            index_hw;
-       unsigned int            ipi_redirect;
+
+       unsigned int            last_tag ____cacheline_aligned_in_smp;
 
        /* incremented at dispatch time */
        unsigned long           rq_dispatched[2];
@@ -20,14 +23,16 @@ struct blk_mq_ctx {
 
        struct request_queue    *queue;
        struct kobject          kobj;
-};
+} ____cacheline_aligned_in_smp;
 
 void __blk_mq_complete_request(struct request *rq);
 void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async);
 void blk_mq_init_flush(struct request_queue *q);
 void blk_mq_drain_queue(struct request_queue *q);
 void blk_mq_free_queue(struct request_queue *q);
-void blk_mq_rq_init(struct blk_mq_hw_ctx *hctx, struct request *rq);
+void blk_mq_clone_flush_request(struct request *flush_rq,
+               struct request *orig_rq);
+int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr);
 
 /*
  * CPU hotplug helpers
@@ -45,10 +50,16 @@ void blk_mq_disable_hotplug(void);
 /*
  * CPU -> queue mappings
  */
-struct blk_mq_reg;
-extern unsigned int *blk_mq_make_queue_map(struct blk_mq_reg *reg);
+extern unsigned int *blk_mq_make_queue_map(struct blk_mq_tag_set *set);
 extern int blk_mq_update_queue_map(unsigned int *map, unsigned int nr_queues);
 
-void blk_mq_add_timer(struct request *rq);
+/*
+ * Basic implementation of sparser bitmap, allowing the user to spread
+ * the bits over more cachelines.
+ */
+struct blk_align_bitmap {
+       unsigned long word;
+       unsigned long depth;
+} ____cacheline_aligned_in_smp;
 
 #endif