diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-core.c | 21 | ||||
-rw-r--r-- | block/blk-settings.c | 6 |
2 files changed, 14 insertions, 13 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index d17d71c71d4f..f6452f692501 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -884,9 +884,10 @@ EXPORT_SYMBOL(blk_get_request); | |||
884 | 884 | ||
885 | /** | 885 | /** |
886 | * blk_make_request - given a bio, allocate a corresponding struct request. | 886 | * blk_make_request - given a bio, allocate a corresponding struct request. |
887 | * | 887 | * @q: target request queue |
888 | * @bio: The bio describing the memory mappings that will be submitted for IO. | 888 | * @bio: The bio describing the memory mappings that will be submitted for IO. |
889 | * It may be a chained-bio properly constructed by block/bio layer. | 889 | * It may be a chained-bio properly constructed by block/bio layer. |
890 | * @gfp_mask: gfp flags to be used for memory allocation | ||
890 | * | 891 | * |
891 | * blk_make_request is the parallel of generic_make_request for BLOCK_PC | 892 | * blk_make_request is the parallel of generic_make_request for BLOCK_PC |
892 | * type commands. Where the struct request needs to be farther initialized by | 893 | * type commands. Where the struct request needs to be farther initialized by |
@@ -1872,14 +1873,14 @@ EXPORT_SYMBOL(blk_fetch_request); | |||
1872 | 1873 | ||
1873 | /** | 1874 | /** |
1874 | * blk_update_request - Special helper function for request stacking drivers | 1875 | * blk_update_request - Special helper function for request stacking drivers |
1875 | * @rq: the request being processed | 1876 | * @req: the request being processed |
1876 | * @error: %0 for success, < %0 for error | 1877 | * @error: %0 for success, < %0 for error |
1877 | * @nr_bytes: number of bytes to complete @rq | 1878 | * @nr_bytes: number of bytes to complete @req |
1878 | * | 1879 | * |
1879 | * Description: | 1880 | * Description: |
1880 | * Ends I/O on a number of bytes attached to @rq, but doesn't complete | 1881 | * Ends I/O on a number of bytes attached to @req, but doesn't complete |
1881 | * the request structure even if @rq doesn't have leftover. | 1882 | * the request structure even if @req doesn't have leftover. |
1882 | * If @rq has leftover, sets it up for the next range of segments. | 1883 | * If @req has leftover, sets it up for the next range of segments. |
1883 | * | 1884 | * |
1884 | * This special helper function is only for request stacking drivers | 1885 | * This special helper function is only for request stacking drivers |
1885 | * (e.g. request-based dm) so that they can handle partial completion. | 1886 | * (e.g. request-based dm) so that they can handle partial completion. |
@@ -2145,7 +2146,7 @@ EXPORT_SYMBOL_GPL(blk_end_request); | |||
2145 | /** | 2146 | /** |
2146 | * blk_end_request_all - Helper function for drives to finish the request. | 2147 | * blk_end_request_all - Helper function for drives to finish the request. |
2147 | * @rq: the request to finish | 2148 | * @rq: the request to finish |
2148 | * @err: %0 for success, < %0 for error | 2149 | * @error: %0 for success, < %0 for error |
2149 | * | 2150 | * |
2150 | * Description: | 2151 | * Description: |
2151 | * Completely finish @rq. | 2152 | * Completely finish @rq. |
@@ -2166,7 +2167,7 @@ EXPORT_SYMBOL_GPL(blk_end_request_all); | |||
2166 | /** | 2167 | /** |
2167 | * blk_end_request_cur - Helper function to finish the current request chunk. | 2168 | * blk_end_request_cur - Helper function to finish the current request chunk. |
2168 | * @rq: the request to finish the current chunk for | 2169 | * @rq: the request to finish the current chunk for |
2169 | * @err: %0 for success, < %0 for error | 2170 | * @error: %0 for success, < %0 for error |
2170 | * | 2171 | * |
2171 | * Description: | 2172 | * Description: |
2172 | * Complete the current consecutively mapped chunk from @rq. | 2173 | * Complete the current consecutively mapped chunk from @rq. |
@@ -2203,7 +2204,7 @@ EXPORT_SYMBOL_GPL(__blk_end_request); | |||
2203 | /** | 2204 | /** |
2204 | * __blk_end_request_all - Helper function for drives to finish the request. | 2205 | * __blk_end_request_all - Helper function for drives to finish the request. |
2205 | * @rq: the request to finish | 2206 | * @rq: the request to finish |
2206 | * @err: %0 for success, < %0 for error | 2207 | * @error: %0 for success, < %0 for error |
2207 | * | 2208 | * |
2208 | * Description: | 2209 | * Description: |
2209 | * Completely finish @rq. Must be called with queue lock held. | 2210 | * Completely finish @rq. Must be called with queue lock held. |
@@ -2224,7 +2225,7 @@ EXPORT_SYMBOL_GPL(__blk_end_request_all); | |||
2224 | /** | 2225 | /** |
2225 | * __blk_end_request_cur - Helper function to finish the current request chunk. | 2226 | * __blk_end_request_cur - Helper function to finish the current request chunk. |
2226 | * @rq: the request to finish the current chunk for | 2227 | * @rq: the request to finish the current chunk for |
2227 | * @err: %0 for success, < %0 for error | 2228 | * @error: %0 for success, < %0 for error |
2228 | * | 2229 | * |
2229 | * Description: | 2230 | * Description: |
2230 | * Complete the current consecutively mapped chunk from @rq. Must | 2231 | * Complete the current consecutively mapped chunk from @rq. Must |
diff --git a/block/blk-settings.c b/block/blk-settings.c index 1c4df9bf6813..d71cedc09c4e 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
@@ -343,7 +343,7 @@ EXPORT_SYMBOL(blk_queue_physical_block_size); | |||
343 | /** | 343 | /** |
344 | * blk_queue_alignment_offset - set physical block alignment offset | 344 | * blk_queue_alignment_offset - set physical block alignment offset |
345 | * @q: the request queue for the device | 345 | * @q: the request queue for the device |
346 | * @alignment: alignment offset in bytes | 346 | * @offset: alignment offset in bytes |
347 | * | 347 | * |
348 | * Description: | 348 | * Description: |
349 | * Some devices are naturally misaligned to compensate for things like | 349 | * Some devices are naturally misaligned to compensate for things like |
@@ -362,7 +362,7 @@ EXPORT_SYMBOL(blk_queue_alignment_offset); | |||
362 | /** | 362 | /** |
363 | * blk_queue_io_min - set minimum request size for the queue | 363 | * blk_queue_io_min - set minimum request size for the queue |
364 | * @q: the request queue for the device | 364 | * @q: the request queue for the device |
365 | * @io_min: smallest I/O size in bytes | 365 | * @min: smallest I/O size in bytes |
366 | * | 366 | * |
367 | * Description: | 367 | * Description: |
368 | * Some devices have an internal block size bigger than the reported | 368 | * Some devices have an internal block size bigger than the reported |
@@ -385,7 +385,7 @@ EXPORT_SYMBOL(blk_queue_io_min); | |||
385 | /** | 385 | /** |
386 | * blk_queue_io_opt - set optimal request size for the queue | 386 | * blk_queue_io_opt - set optimal request size for the queue |
387 | * @q: the request queue for the device | 387 | * @q: the request queue for the device |
388 | * @io_opt: optimal request size in bytes | 388 | * @opt: optimal request size in bytes |
389 | * | 389 | * |
390 | * Description: | 390 | * Description: |
391 | * Drivers can call this function to set the preferred I/O request | 391 | * Drivers can call this function to set the preferred I/O request |