* [PATCH] block: fix kerneldoc comment for blk_attempt_plug_merge()
@ 2019-01-09 20:59 Jonathan Corbet
2019-01-09 22:29 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Jonathan Corbet @ 2019-01-09 20:59 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-block
Commit 5f0ed774ed29 ("block: sum requests in the plug structure") removed
the request_count parameter from block_attempt_plug_merge(), but did not
remove the associated kerneldoc comment, introducing this warning to the
docs build:
./block/blk-core.c:685: warning: Excess function parameter 'request_count' description in 'blk_attempt_plug_merge'
Remove the obsolete description and make things a little quieter.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
block/blk-core.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index c78042975737..eba494f528cb 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -661,7 +661,6 @@ bool bio_attempt_discard_merge(struct request_queue *q, struct request *req,
* blk_attempt_plug_merge - try to merge with %current's plugged list
* @q: request_queue new bio is being queued at
* @bio: new bio being queued
- * @request_count: out parameter for number of traversed plugged requests
* @same_queue_rq: pointer to &struct request that gets filled in when
* another request associated with @q is found on the plug list
* (optional, may be %NULL)
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] block: fix kerneldoc comment for blk_attempt_plug_merge()
2019-01-09 20:59 [PATCH] block: fix kerneldoc comment for blk_attempt_plug_merge() Jonathan Corbet
@ 2019-01-09 22:29 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2019-01-09 22:29 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-block
On 1/9/19 1:59 PM, Jonathan Corbet wrote:
> Commit 5f0ed774ed29 ("block: sum requests in the plug structure") removed
> the request_count parameter from block_attempt_plug_merge(), but did not
> remove the associated kerneldoc comment, introducing this warning to the
> docs build:
>
> ./block/blk-core.c:685: warning: Excess function parameter 'request_count' description in 'blk_attempt_plug_merge'
>
> Remove the obsolete description and make things a little quieter.
Applied, thanks Jon.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-09 22:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-09 20:59 [PATCH] block: fix kerneldoc comment for blk_attempt_plug_merge() Jonathan Corbet
2019-01-09 22:29 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).