aboutsummaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-11-14 17:19:46 -0800
committerJens Axboe <axboe@kernel.dk>2018-11-14 18:49:38 -0700
commite96c0d8336fdc5f1a6cae798bfa9c6e730001ad4 (patch)
tree962e7fe7e528e7fe39b3b4feeda798ca9671aae6 /block/blk-merge.c
parent7ff4f8035695984c513598e2d49c8277d5d234ca (diff)
downloadlinux-stericsson-e96c0d8336fdc5f1a6cae798bfa9c6e730001ad4.tar.gz
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>
Diffstat (limited to 'block/blk-merge.c')
-rw-r--r--block/blk-merge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 91b2af332a84..da0217f321c4 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;