From 4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 13:10:25 +0200 Subject: Replaces a section with the centos code Signed-off-by: Thiago Abdo --- drivers/block/loop/loop_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/block/loop/loop_main.c') diff --git a/drivers/block/loop/loop_main.c b/drivers/block/loop/loop_main.c index 7c1bb19a1cf1..e255a6c3d510 100644 --- a/drivers/block/loop/loop_main.c +++ b/drivers/block/loop/loop_main.c @@ -1728,10 +1728,10 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_ctx *hctx, /* always use the first bio's css */ #ifdef CONFIG_BLK_CGROUP - if (cmd->use_aio && rq->bio && rq->bio->bi_css) { - cmd->css = rq->bio->bi_css; - css_get(cmd->css); - } else + if (cmd->use_aio && rq->bio && rq->bio->bi_blkg) { + cmd->css = &bio_blkcg(rq->bio)->css; + css_get(cmd->css); + } else #endif cmd->css = NULL; kthread_queue_work(&lo->worker, &cmd->work); -- cgit v1.2.3-55-g7522