* [PATCH] block: make blk_try_req_merge() static
@ 2018-11-15 1:19 Eric Biggers
2018-11-15 1:50 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Eric Biggers @ 2018-11-15 1:19 UTC (permalink / raw)
To: linux-block, Jens Axboe
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(-)
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;
--
2.19.1.930.g4563a0d9d0-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] block: make blk_try_req_merge() static
2018-11-15 1:19 [PATCH] block: make blk_try_req_merge() static Eric Biggers
@ 2018-11-15 1:50 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2018-11-15 1:50 UTC (permalink / raw)
To: Eric Biggers, linux-block
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.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-15 1:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-15 1:19 [PATCH] block: make blk_try_req_merge() static Eric Biggers
2018-11-15 1:50 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox