From: Laibin Qiu <qiulaibin@huawei.com> hulk inclusion category: bugfix bugzilla: 182135 CVE: NA ------------------------------------------------- td is isolated by CONFIG_BLK_DEV_THROTTLING in struct request_queue. Signed-off-by: Laibin Qiu <qiulaibin@huawei.com> Reviewed-by: Hou Tao <houtao1@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- block/blk-cgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index c55a903bd8058..ce04c5a5ebb11 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1342,9 +1342,10 @@ void blkcg_drain_queue(struct request_queue *q) * @q could be exiting and q->td has not been initialized. * If so, don't need drain any throttled bios. */ +#ifdef CONFIG_BLK_DEV_THROTTLIN if (!q->td) return; - +#endif blk_throtl_drain(q); } -- 2.25.1