summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Abdo2019-10-15 13:10:25 +0200
committerThiago Abdo2019-10-15 13:10:25 +0200
commit4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5 (patch)
tree7f23e578d2a829e564aea9efeeb03a5fa7ceb136
parentblock: loop: fix initialization issue in loop_set_status* (diff)
downloadkernel-qcow2-linux-4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5.tar.gz
kernel-qcow2-linux-4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5.tar.xz
kernel-qcow2-linux-4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5.zip
Replaces a section with the centos code
Signed-off-by: Thiago Abdo <tjabdo@inf.ufpr.br>
-rw-r--r--drivers/block/loop/loop_main.c8
1 files changed, 4 insertions, 4 deletions
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);