diff options
| author | Jinlong Chen <nickyc975@zju.edu.cn> | 2022-11-29 23:46:38 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-11-29 10:53:10 -0700 |
| commit | 8d283ee62b077968e218531b24260e1cc51bd484 (patch) | |
| tree | 1acd4deeff4c7703eb4546cdcb231a99fea51608 /block | |
| parent | c6451ede406b9f57fcd61d48433a6b8b2be862e3 (diff) | |
| download | linux-stable-8d283ee62b077968e218531b24260e1cc51bd484.tar.gz linux-stable-8d283ee62b077968e218531b24260e1cc51bd484.tar.bz2 linux-stable-8d283ee62b077968e218531b24260e1cc51bd484.zip | |
block: use bool as the return type of elv_iosched_allow_bio_merge
We have bool type now, update the old signature.
Signed-off-by: Jinlong Chen <nickyc975@zju.edu.cn>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/0db0a0298758d60d0f4df8b7126ac6a381e5a5bb.1669736350.git.nickyc975@zju.edu.cn
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/elevator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index 8a5c171306f1..14e03632b5b5 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; } /* |