Commit e96c0d83 authored Nov 14, 2018 by Eric Biggers Committed by Jens Axboe Nov 14, 2018

block: make blk_try_req_merge() static



blk_try_req_merge() is only used in block/blk-merge.c, so make it
static.

This addresses a gcc warning when -Wmissing-prototypes is enabled.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 7ff4f803

block/blk-merge.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -712,7 +712,8 @@ static inline bool blk_discard_mergable(struct request *req)
		return false;
		}

		enum elv_merge blk_try_req_merge(struct request req, struct request next)
		static enum elv_merge blk_try_req_merge(struct request *req,
		struct request *next)
		{
		if (blk_discard_mergable(req))
		return ELEVATOR_DISCARD_MERGE;

Admin message