aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-06-20 08:21:01 -0400
committerJens Axboe <axboe@suse.de>2005-06-20 08:21:01 -0400
commit73747aed04d3b3fb694961d025f81863b99c6898 (patch)
treed7cae2a3da1e15dc8c87b0ffbf2608eb8c999cc9 /drivers/block
parent994ca9a19616f0d4161a9e825f0835925d522426 (diff)
[PATCH] ll_rw_blk.c kerneldoc updates
The recent mapping changes didn't update the kerneldoc appropriately. Original from Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/ll_rw_blk.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index d260a2ce9a70..f6fda036b4ae 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -2090,7 +2090,7 @@ EXPORT_SYMBOL(blk_insert_request);
2090/** 2090/**
2091 * blk_rq_map_user - map user data to a request, for REQ_BLOCK_PC usage 2091 * blk_rq_map_user - map user data to a request, for REQ_BLOCK_PC usage
2092 * @q: request queue where request should be inserted 2092 * @q: request queue where request should be inserted
2093 * @rw: READ or WRITE data 2093 * @rq: request structure to fill
2094 * @ubuf: the user buffer 2094 * @ubuf: the user buffer
2095 * @len: length of user data 2095 * @len: length of user data
2096 * 2096 *
@@ -2194,12 +2194,11 @@ EXPORT_SYMBOL(blk_rq_map_user_iov);
2194 2194
2195/** 2195/**
2196 * blk_rq_unmap_user - unmap a request with user data 2196 * blk_rq_unmap_user - unmap a request with user data
2197 * @rq: request to be unmapped 2197 * @bio: bio to be unmapped
2198 * @bio: bio for the request
2199 * @ulen: length of user buffer 2198 * @ulen: length of user buffer
2200 * 2199 *
2201 * Description: 2200 * Description:
2202 * Unmap a request previously mapped by blk_rq_map_user(). 2201 * Unmap a bio previously mapped by blk_rq_map_user().
2203 */ 2202 */
2204int blk_rq_unmap_user(struct bio *bio, unsigned int ulen) 2203int blk_rq_unmap_user(struct bio *bio, unsigned int ulen)
2205{ 2204{
@@ -2220,9 +2219,10 @@ EXPORT_SYMBOL(blk_rq_unmap_user);
2220/** 2219/**
2221 * blk_rq_map_kern - map kernel data to a request, for REQ_BLOCK_PC usage 2220 * blk_rq_map_kern - map kernel data to a request, for REQ_BLOCK_PC usage
2222 * @q: request queue where request should be inserted 2221 * @q: request queue where request should be inserted
2223 * @rw: READ or WRITE data 2222 * @rq: request to fill
2224 * @kbuf: the kernel buffer 2223 * @kbuf: the kernel buffer
2225 * @len: length of user data 2224 * @len: length of user data
2225 * @gfp_mask: memory allocation flags
2226 */ 2226 */
2227int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf, 2227int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf,
2228 unsigned int len, unsigned int gfp_mask) 2228 unsigned int len, unsigned int gfp_mask)
@@ -2251,6 +2251,18 @@ int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf,
2251 2251
2252EXPORT_SYMBOL(blk_rq_map_kern); 2252EXPORT_SYMBOL(blk_rq_map_kern);
2253 2253
2254/**
2255 * blk_execute_rq_nowait - insert a request into queue for execution
2256 * @q: queue to insert the request in
2257 * @bd_disk: matching gendisk
2258 * @rq: request to insert
2259 * @at_head: insert request at head or tail of queue
2260 * @done: I/O completion handler
2261 *
2262 * Description:
2263 * Insert a fully prepared request at the back of the io scheduler queue
2264 * for execution. Don't wait for completion.
2265 */
2254void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk, 2266void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,
2255 struct request *rq, int at_head, 2267 struct request *rq, int at_head,
2256 void (*done)(struct request *)) 2268 void (*done)(struct request *))
@@ -2273,7 +2285,7 @@ void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,
2273 * 2285 *
2274 * Description: 2286 * Description:
2275 * Insert a fully prepared request at the back of the io scheduler queue 2287 * Insert a fully prepared request at the back of the io scheduler queue
2276 * for execution. 2288 * for execution and wait for completion.
2277 */ 2289 */
2278int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk, 2290int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
2279 struct request *rq, int at_head) 2291 struct request *rq, int at_head)