summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2015-10-30 18:36:16 -0700
committerJens Axboe <axboe@fb.com>2015-11-11 09:36:57 -0700
commitccc2600b8a28f3eb0c126cd00312baba1c22cccb (patch)
treefe1b9e9b7ba6ca21dca02839278968feba58d1ed /block
parentdbd3ca50753e70e09cad747dce23b1a7683a3342 (diff)
downloadblackbird-op-linux-ccc2600b8a28f3eb0c126cd00312baba1c22cccb.tar.gz
blackbird-op-linux-ccc2600b8a28f3eb0c126cd00312baba1c22cccb.zip
block: fix blk-core.c kernel-doc warning
Fix kernel-doc warning in blk-core.c: Warning(..//block/blk-core.c:1549): No description found for parameter 'same_queue_rq' Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reviewed-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 2bbf08cd2900..5131993b23a1 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1575,6 +1575,9 @@ bool bio_attempt_front_merge(struct request_queue *q, struct request *req,
* @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)
*
* Determine whether @bio being queued on @q can be merged with a request
* on %current's plugged list. Returns %true if merge was successful,
OpenPOWER on IntegriCloud