From: Eric Biggers <ebiggers@google.com>
Date: Thu, 15 Nov 2018 01:19:46 +0000 (-0800)
Subject: block: make blk_try_req_merge() static
X-Git-Tag: v5.0-rc1~52^2~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e96c0d8336fdc5f1a6cae798bfa9c6e730001ad4;p=thirdparty%2Flinux.git

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>
---

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 91b2af332a845..da0217f321c42 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -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;