1 files changed, 2 insertions, 2 deletions

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 00cdc987b525..aa41b47c22d2 100644
--- 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);