Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...

[linux-drm-fsl-dcu.git] / block / blk-sysfs.c

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 3aa5b195f4dd45e7519e9053cf1593197efc86bd..97779522472f8356d5b09e91a33b1b310293d230 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -7,6 +7,7 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/blktrace_api.h>
+#include <linux/blk-mq.h>
 
 #include "blk.h"
 #include "blk-cgroup.h"
@@ -287,7 +288,7 @@ static ssize_t
 queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count)
 {
        ssize_t ret = -EINVAL;
-#if defined(CONFIG_USE_GENERIC_SMP_HELPERS)
+#ifdef CONFIG_SMP
        unsigned long val;
 
        ret = queue_var_store(&val, page, count);
@@ -542,6 +543,11 @@ static void blk_release_queue(struct kobject *kobj)
        if (q->queue_tags)
                __blk_queue_free_tags(q);
 
+       percpu_counter_destroy(&q->mq_usage_counter);
+
+       if (q->mq_ops)
+               blk_mq_free_queue(q);
+
        blk_trace_shutdown(q);
 
        bdi_destroy(&q->backing_dev_info);
@@ -575,6 +581,7 @@ int blk_register_queue(struct gendisk *disk)
         * bypass from queue allocation.
         */
        blk_queue_bypass_end(q);
+       queue_flag_set_unlocked(QUEUE_FLAG_INIT_DONE, q);
 
        ret = blk_trace_init_sysfs(dev);
        if (ret)
@@ -588,6 +595,9 @@ int blk_register_queue(struct gendisk *disk)
 
        kobject_uevent(&q->kobj, KOBJ_ADD);
 
+       if (q->mq_ops)
+               blk_mq_register_disk(disk);
+
        if (!q->request_fn)
                return 0;
 
@@ -610,6 +620,9 @@ void blk_unregister_queue(struct gendisk *disk)
        if (WARN_ON(!q))
                return;
 
+       if (q->mq_ops)
+               blk_mq_unregister_disk(disk);
+
        if (q->request_fn)
                elv_unregister_queue(q);