Skip to contentSkip to conversation

block: make blk_try_req_merge() static

PATCH In review Eric Biggers 2 participants 2 messages Nov 15, 2018 Block layer

lore
Share & tools
lore

Eric Biggers

author
#0 lore raw

PATCH 1/1 block: make blk_try_req_merge() static

From: Eric Biggers <[email protected]>

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 <[email protected]>
---
 block/blk-merge.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
block/blk-merge.c +2 -1
index e7696c47489ad..badccafc91303 100644
@@ -731,7 +731,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;
Signature · 1 line
2.19.1.930.g4563a0d9d0-goog
maintainer
#1 lore raw
Quoted 6 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Added for 4.21, thanks.

Signature · 1 line
Jens Axboe