]> git.baikalelectronics.ru Git - kernel.git/commitdiff
blk-cgroup: cleanup blkcg_maybe_throttle_current
authorChristoph Hellwig <hch@lst.de>
Wed, 20 Apr 2022 04:27:22 +0000 (06:27 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 2 May 2022 20:06:20 +0000 (14:06 -0600)
Use blkcg_css instead of opencoding it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220420042723.1010598-15-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-cgroup.c

index 5684a8ce1f75523e50696918a435c74de6aa81d1..a91f8ae18b49bd4b6964af67e7a0c2eec31ea2b3 100644 (file)
@@ -1808,7 +1808,6 @@ static void blkcg_maybe_throttle_blkg(struct blkcg_gq *blkg, bool use_memdelay)
 void blkcg_maybe_throttle_current(void)
 {
        struct request_queue *q = current->throttle_queue;
-       struct cgroup_subsys_state *css;
        struct blkcg *blkcg;
        struct blkcg_gq *blkg;
        bool use_memdelay = current->use_memdelay;
@@ -1820,12 +1819,7 @@ void blkcg_maybe_throttle_current(void)
        current->use_memdelay = false;
 
        rcu_read_lock();
-       css = kthread_blkcg();
-       if (css)
-               blkcg = css_to_blkcg(css);
-       else
-               blkcg = css_to_blkcg(task_css(current, io_cgrp_id));
-
+       blkcg = css_to_blkcg(blkcg_css());
        if (!blkcg)
                goto out;
        blkg = blkg_lookup(blkcg, q);