diff mbox series

block: make blk_try_req_merge() static

Message ID 20181115011946.123485-1-ebiggers@kernel.org (mailing list archive)
State New, archived
Headers show
Series block: make blk_try_req_merge() static | expand

Commit Message

Eric Biggers Nov. 15, 2018, 1:19 a.m. UTC 
From: Eric Biggers <ebiggers@google.com>

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>
---
 block/blk-merge.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jens Axboe Nov. 15, 2018, 1:50 a.m. UTC | #1 
On 11/14/18 6:19 PM, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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.
diff mbox series

Patch

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