linux-kernel - [PATCH 5.10] block, bfq: remove useless checking in bfq_put

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20241007141618.1766564-1-g.ryurikov@securitycode.ru>
Date: Mon, 7 Oct 2024 17:16:18 +0300
From: George Rurikov <g.ryurikov@...uritycode.ru>
To: <stable@...r.kernel.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>
CC: George Ryurikov <g.ryurikov@...uritycode.ru>, Paolo Valente
	<paolo.valente@...aro.org>, Jens Axboe <axboe@...nel.dk>,
	<linux-block@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	<lvc-project@...uxtesting.org>, Yu Kuai <yukuai3@...wei.com>, Jan Kara
	<jack@...e.cz>
Subject: [PATCH 5.10] block, bfq: remove useless checking in bfq_put_queue()

From: George Ryurikov <g.ryurikov@...uritycode.ru>

From: Yu Kuai <yukuai3@...wei.com>

commit 1e3cc2125d7cc7d492b2e6e52d09c1e17ba573c3 upstream.

'bfqq->bfqd' is ensured to set in bfq_init_queue(), and it will never
change afterwards.

Signed-off-by: Yu Kuai <yukuai3@...wei.com>
Reviewed-by: Jan Kara <jack@...e.cz>
Link: https://lore.kernel.org/r/20220816015631.1323948-3-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@...nel.dk>
Signed-off-by: George Ryurikov <g.ryurikov@...uritycode.ru>
---
 block/bfq-iosched.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 6687b805bab3..0031c5751d89 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -4864,9 +4864,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)
@@ -4931,7 +4929,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);
--
2.34.1
Заявление о конфиденциальности

Данное электронное письмо и любые приложения к нему являются конфиденциальными и предназначены исключительно для адресата. Если Вы не являетесь адресатом данного письма, пожалуйста, уведомите немедленно отправителя, не раскрывайте содержание другим лицам, не используйте его в каких-либо целях, не храните и не копируйте информацию любым способом.