Merge tag 'for-4.19/block-20180812' of git://git.kernel.dk/linux-block

[linux] / include / linux / blk-mq.h

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index ca3f2c2..1da59c1 100644 (file)
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -35,10 +35,12 @@ struct blk_mq_hw_ctx {
        struct sbitmap          ctx_map;
 
        struct blk_mq_ctx       *dispatch_from;
+       unsigned int            dispatch_busy;
 
-       struct blk_mq_ctx       **ctxs;
        unsigned int            nr_ctx;
+       struct blk_mq_ctx       **ctxs;
 
+       spinlock_t              dispatch_wait_lock;
        wait_queue_entry_t      dispatch_wait;
        atomic_t                wait_index;