aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/DocBook/kernel-api.tmpl2
-rw-r--r--block/blk-core.c2
-rw-r--r--block/blk-settings.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index f31601e8bd89..dc0f30c3e571 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -361,12 +361,14 @@ X!Edrivers/pnp/system.c
361 <chapter id="blkdev"> 361 <chapter id="blkdev">
362 <title>Block Devices</title> 362 <title>Block Devices</title>
363!Eblock/blk-core.c 363!Eblock/blk-core.c
364!Iblock/blk-core.c
364!Eblock/blk-map.c 365!Eblock/blk-map.c
365!Iblock/blk-sysfs.c 366!Iblock/blk-sysfs.c
366!Eblock/blk-settings.c 367!Eblock/blk-settings.c
367!Eblock/blk-exec.c 368!Eblock/blk-exec.c
368!Eblock/blk-barrier.c 369!Eblock/blk-barrier.c
369!Eblock/blk-tag.c 370!Eblock/blk-tag.c
371!Iblock/blk-tag.c
370 </chapter> 372 </chapter>
371 373
372 <chapter id="chrdev"> 374 <chapter id="chrdev">
diff --git a/block/blk-core.c b/block/blk-core.c
index 775c8516abf5..2d7e3a2f56c4 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1768,6 +1768,7 @@ static inline void __end_request(struct request *rq, int uptodate,
1768 1768
1769/** 1769/**
1770 * blk_rq_bytes - Returns bytes left to complete in the entire request 1770 * blk_rq_bytes - Returns bytes left to complete in the entire request
1771 * @rq: the request being processed
1771 **/ 1772 **/
1772unsigned int blk_rq_bytes(struct request *rq) 1773unsigned int blk_rq_bytes(struct request *rq)
1773{ 1774{
@@ -1780,6 +1781,7 @@ EXPORT_SYMBOL_GPL(blk_rq_bytes);
1780 1781
1781/** 1782/**
1782 * blk_rq_cur_bytes - Returns bytes left to complete in the current segment 1783 * blk_rq_cur_bytes - Returns bytes left to complete in the current segment
1784 * @rq: the request being processed
1783 **/ 1785 **/
1784unsigned int blk_rq_cur_bytes(struct request *rq) 1786unsigned int blk_rq_cur_bytes(struct request *rq)
1785{ 1787{
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 9a8ffdd0ce3d..da923fed1f2c 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -294,7 +294,6 @@ EXPORT_SYMBOL(blk_queue_stack_limits);
294 294
295/** 295/**
296 * blk_queue_dma_drain - Set up a drain buffer for excess dma. 296 * blk_queue_dma_drain - Set up a drain buffer for excess dma.
297 *
298 * @q: the request queue for the device 297 * @q: the request queue for the device
299 * @dma_drain_needed: fn which returns non-zero if drain is necessary 298 * @dma_drain_needed: fn which returns non-zero if drain is necessary
300 * @buf: physically contiguous buffer 299 * @buf: physically contiguous buffer