[PATCH 4/4] elevator: use bool instead of int as the return type of elv_iosched_allow_bio_merge

Jinlong Chen posted 4 patches 2 years, 9 months ago
There is a newer version of this series
[PATCH 4/4] elevator: use bool instead of int as the return type of elv_iosched_allow_bio_merge
Posted by Jinlong Chen 2 years, 9 months ago
We have bool type now, update the old signature.

Signed-off-by: Jinlong Chen <nickyc975@zju.edu.cn>
---
 block/elevator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/elevator.c b/block/elevator.c
index 93dbaa560b67..cb1c9a69026c 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -57,7 +57,7 @@ static LIST_HEAD(elv_list);
  * Query io scheduler to see if the current process issuing bio may be
  * merged with rq.
  */
-static int elv_iosched_allow_bio_merge(struct request *rq, struct bio *bio)
+static bool elv_iosched_allow_bio_merge(struct request *rq, struct bio *bio)
 {
 	struct request_queue *q = rq->q;
 	struct elevator_queue *e = q->elevator;
@@ -65,7 +65,7 @@ static int elv_iosched_allow_bio_merge(struct request *rq, struct bio *bio)
 	if (e->type->ops.allow_merge)
 		return e->type->ops.allow_merge(q, rq, bio);
 
-	return 1;
+	return true;
 }
 
 /*
-- 
2.34.1
Re: [PATCH 4/4] elevator: use bool instead of int as the return type of elv_iosched_allow_bio_merge
Posted by Christoph Hellwig 2 years, 9 months ago
On Fri, Nov 25, 2022 at 11:53:14PM +0800, Jinlong Chen wrote:
> We have bool type now, update the old signature.

Looks good, especially as the allow_merge method already returns a bool:

Reviewed-by: Christoph Hellwig <hch@lst.de>