block, bfq: merge bfq_release_process_ref() into bfq_put_cooperator()

Because bfq_put_cooperator() is always followed by
bfq_release_process_ref().

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240909134154.954924-4-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 9fb9f353315025a4004b8097bb138ddfe34a0dd2..e831aedb464329ab8c1c06855338eb47d086089e 100644 (file)
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -736,7 +736,6 @@ static void bfq_sync_bfqq_move(struct bfq_data *bfqd,
                 */
                bfq_put_cooperator(sync_bfqq);
                bic_set_bfqq(bic, NULL, true, act_idx);
-               bfq_release_process_ref(bfqd, sync_bfqq);
        }
 }
 

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index f4192d5411d2a0d89c0fb09764f4e612a4eacb79..17b0bf6b56bb642059504725bdc1d5f84bedbef1 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -5434,6 +5434,8 @@ void bfq_put_cooperator(struct bfq_queue *bfqq)
                bfq_put_queue(__bfqq);
                __bfqq = next;
        }
+
+       bfq_release_process_ref(bfqq->bfqd, bfqq);
 }
 
 static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
@@ -5446,8 +5448,6 @@ static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq)
        bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq, bfqq->ref);
 
        bfq_put_cooperator(bfqq);
-
-       bfq_release_process_ref(bfqd, bfqq);
 }
 
 static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync,
@@ -6734,8 +6734,6 @@ bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq)
        bic_set_bfqq(bic, NULL, true, bfqq->actuator_idx);
 
        bfq_put_cooperator(bfqq);
-
-       bfq_release_process_ref(bfqq->bfqd, bfqq);
        return NULL;
 }