block: make blk_try_req_merge() static
authorEric Biggers <ebiggers@google.com>
Thu, 15 Nov 2018 01:19:46 +0000 (17:19 -0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 15 Nov 2018 01:49:38 +0000 (18:49 -0700)
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>
block/blk-merge.c

index 91b2af332a8455e73a221bd52a6171ece802b7a7..da0217f321c4255a02401971933ff7dc239335a5 100644 (file)
@@ -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;