bfq: Remove bfq_requeue_request_body()
authorJan Kara <jack@suse.cz>
Thu, 19 May 2022 10:52:32 +0000 (12:52 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 19 May 2022 12:52:36 +0000 (06:52 -0600)
The function has only a single caller and two lines. Just remove it
since it is pointless and just harming readability.

Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220519105235.31397-4-jack@suse.cz
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bfq-iosched.c

index 62de9f8..038e075 100644 (file)
@@ -6368,12 +6368,6 @@ static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd)
                bfq_schedule_dispatch(bfqd);
 }
 
-static void bfq_finish_requeue_request_body(struct bfq_queue *bfqq)
-{
-       bfqq_request_freed(bfqq);
-       bfq_put_queue(bfqq);
-}
-
 /*
  * The processes associated with bfqq may happen to generate their
  * cumulative I/O at a lower rate than the rate at which the device
@@ -6570,7 +6564,8 @@ static void bfq_finish_requeue_request(struct request *rq)
 
                bfq_completed_request(bfqq, bfqd);
        }
-       bfq_finish_requeue_request_body(bfqq);
+       bfqq_request_freed(bfqq);
+       bfq_put_queue(bfqq);
        RQ_BIC(rq)->requests--;
        spin_unlock_irqrestore(&bfqd->lock, flags);