Merge tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman...

[linux-2.6-microblaze.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1aafeb9..592669b 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -542,7 +542,7 @@ struct request_queue {
        struct list_head        unused_hctx_list;
        spinlock_t              unused_hctx_lock;
 
-       atomic_t                mq_freeze_depth;
+       int                     mq_freeze_depth;
 
 #if defined(CONFIG_BLK_DEV_BSG)
        struct bsg_class_device bsg_dev;
@@ -554,6 +554,11 @@ struct request_queue {
 #endif
        struct rcu_head         rcu_head;
        wait_queue_head_t       mq_freeze_wq;
+       /*
+        * Protect concurrent access to q_usage_counter by
+        * percpu_ref_kill() and percpu_ref_reinit().
+        */
+       struct mutex            mq_freeze_lock;
        struct percpu_ref       q_usage_counter;
 
        struct blk_mq_tag_set   *tag_set;