From: Josef Bacik <josef@toxicpanda.com>
Date: Tue, 31 Jul 2018 16:39:03 +0000 (-0400)
Subject: blk-cgroup: hold the queue ref during throttling
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cc7ecc258562b065ef638c4b45e20953d57fb564;p=linux.git

blk-cgroup: hold the queue ref during throttling

The blkg lifetime is protected by the queue lifetime, so we need to put
the queue _after_ we're done using the blkg.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 1942357d7165d..694595b29b8fd 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1759,10 +1759,10 @@ void blkcg_maybe_throttle_current(void)
 	if (!blkg)
 		goto out;
 	rcu_read_unlock();
-	blk_put_queue(q);
 
 	blkcg_maybe_throttle_blkg(blkg, use_memdelay);
 	blkg_put(blkg);
+	blk_put_queue(q);
 	return;
 out:
 	rcu_read_unlock();