blkcg: unify blkg's for blkcg policies

[karo-tx-linux.git] / block / blk-sysfs.c

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 00cdc987b5259da2d1832d4418c75f4621571405..aa41b47c22d2e89525a5bd3cfb9501e67634bff7 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -480,6 +480,8 @@ static void blk_release_queue(struct kobject *kobj)
 
        blk_sync_queue(q);
 
+       blkcg_exit_queue(q);
+
        if (q->elevator) {
                spin_lock_irq(q->queue_lock);
                ioc_clear_queue(q);
@@ -487,8 +489,6 @@ static void blk_release_queue(struct kobject *kobj)
                elevator_exit(q->elevator);
        }
 
-       blkcg_exit_queue(q);
-
        if (rl->rq_pool)
                mempool_destroy(rl->rq_pool);