Skip to content

Commit dc53d9e

Browse files
johnpgarryaxboe
authored andcommitted
block: Make blk_rq_set_mixed_merge() static
Since commit 8e75637 ("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 <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 0760267 commit dc53d9e

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

block/blk-merge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,
726726
* which can be mixed are set in each bio and mark @rq as mixed
727727
* merged.
728728
*/
729-
void blk_rq_set_mixed_merge(struct request *rq)
729+
static void blk_rq_set_mixed_merge(struct request *rq)
730730
{
731731
blk_opf_t ff = rq->cmd_flags & REQ_FAILFAST_MASK;
732732
struct bio *bio;

block/blk.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ int ll_back_merge_fn(struct request *req, struct bio *bio,
339339
bool blk_attempt_req_merge(struct request_queue *q, struct request *rq,
340340
struct request *next);
341341
unsigned int blk_recalc_rq_segments(struct request *rq);
342-
void blk_rq_set_mixed_merge(struct request *rq);
343342
bool blk_rq_merge_ok(struct request *rq, struct bio *bio);
344343
enum elv_merge blk_try_merge(struct request *rq, struct bio *bio);
345344

0 commit comments

Comments
 (0)