]> git.baikalelectronics.ru Git - kernel.git/commitdiff
block, bfq: remove useless checking in bfq_put_queue()
authorYu Kuai <yukuai3@huawei.com>
Tue, 16 Aug 2022 01:56:30 +0000 (09:56 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 22 Aug 2022 16:07:56 +0000 (10:07 -0600)
'bfqq->bfqd' is ensured to set in bfq_init_queue(), and it will never
change afterwards.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220816015631.1323948-3-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bfq-iosched.c

index c740b41fe0a49981c457d3209f39c27037dbe71f..f39067389b2b75bcfdb4f5e715769c6690d25843 100644 (file)
@@ -5255,9 +5255,7 @@ void bfq_put_queue(struct bfq_queue *bfqq)
        struct hlist_node *n;
        struct bfq_group *bfqg = bfqq_group(bfqq);
 
-       if (bfqq->bfqd)
-               bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d",
-                            bfqq, bfqq->ref);
+       bfq_log_bfqq(bfqq->bfqd, bfqq, "put_queue: %p %d", bfqq, bfqq->ref);
 
        bfqq->ref--;
        if (bfqq->ref)
@@ -5321,7 +5319,7 @@ void bfq_put_queue(struct bfq_queue *bfqq)
                hlist_del_init(&item->woken_list_node);
        }
 
-       if (bfqq->bfqd && bfqq->bfqd->last_completed_rq_bfqq == bfqq)
+       if (bfqq->bfqd->last_completed_rq_bfqq == bfqq)
                bfqq->bfqd->last_completed_rq_bfqq = NULL;
 
        kmem_cache_free(bfq_pool, bfqq);