[PATCH 17/17] block, bfq: remove unnecessary local variable __bfqq in bfq_setup_merge

From: Kemeng Shi
Date: Sat Feb 18 2023 - 21:42:07 EST


We could traversal bfqq->new_bfqq list without a local variable easily and
intuitively. So remove unnecessary local variable __bfqq.

Signed-off-by: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx>
---
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 2705a24ab146..037f73a25567 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -2752,7 +2752,6 @@ static struct bfq_queue *
bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
{
int process_refs, new_process_refs;
- struct bfq_queue *__bfqq;

/*
* If there are no process references on the new_bfqq, then it is
@@ -2764,10 +2763,9 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
return NULL;

/* Avoid a circular list and skip interim queue merges. */
- while ((__bfqq = new_bfqq->new_bfqq)) {
- if (__bfqq == bfqq)
+ while ((new_bfqq = new_bfqq->new_bfqq)) {
+ if (new_bfqq == bfqq)
return NULL;
- new_bfqq = __bfqq;
}

process_refs = bfqq_process_refs(bfqq);
--
2.30.0