diff options
| author | John Garry <john.g.garry@oracle.com> | 2024-03-25 09:35:01 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-03-26 18:28:20 +0100 |
| commit | dc53d9eac1db76fd27b1fcee1f64c840cf82b468 (patch) | |
| tree | 437c8a61730ac9c7b4574991f780fa977d7e72b6 /block | |
| parent | Merge tag 'nvme-6.9-2024-03-21' of git://git.infradead.org/nvme into block-6.9 (diff) | |
| download | linux-dc53d9eac1db76fd27b1fcee1f64c840cf82b468.tar.xz linux-dc53d9eac1db76fd27b1fcee1f64c840cf82b468.zip | |
block: Make blk_rq_set_mixed_merge() static
Since commit 8e756373d7c8 ("block: Move bio merge related functions into
blk-merge.c"), blk_rq_set_mixed_merge() has only been referenced in
blk-merge.c, so make it static.
Signed-off-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240325083501.2816408-1-john.g.garry@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-merge.c | 2 | ||||
| -rw-r--r-- | block/blk.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 2a06fd33039d..4e3483a16b75 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -726,7 +726,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req, * which can be mixed are set in each bio and mark @rq as mixed * merged. */ -void blk_rq_set_mixed_merge(struct request *rq) +static void blk_rq_set_mixed_merge(struct request *rq) { blk_opf_t ff = rq->cmd_flags & REQ_FAILFAST_MASK; struct bio *bio; diff --git a/block/blk.h b/block/blk.h index 5cac4e29ae17..d9f584984bc4 100644 --- a/block/blk.h +++ b/block/blk.h @@ -339,7 +339,6 @@ int ll_back_merge_fn(struct request *req, struct bio *bio, bool blk_attempt_req_merge(struct request_queue *q, struct request *rq, struct request *next); unsigned int blk_recalc_rq_segments(struct request *rq); -void blk_rq_set_mixed_merge(struct request *rq); bool blk_rq_merge_ok(struct request *rq, struct bio *bio); enum elv_merge blk_try_merge(struct request *rq, struct bio *bio); |