openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Biggers 2018-11-14 17:19:46 -08:00 committed by Jens Axboe
parent 7ff4f80356
commit e96c0d8336
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/blk-merge.c
View File

@ -712,7 +712,8 @@ static inline bool blk_discard_mergable(struct request *req)
return false; 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)) if (blk_discard_mergable(req))
return ELEVATOR_DISCARD_MERGE; return ELEVATOR_DISCARD_MERGE;