Commit 649d4968 authored Jan 09, 2019 by Jonathan Corbet Committed by Jens Axboe Jan 09, 2019

block: fix kerneldoc comment for blk_attempt_plug_merge()



Commit 5f0ed774 ("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>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 47cb393e

block/blk-core.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -661,7 +661,6 @@ no_merge:
		* 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)

Admin message