diff options
Diffstat (limited to 'block/ll_rw_blk.c')
-rw-r--r-- | block/ll_rw_blk.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 8e27d0ab0d7c..d38b4afa37ef 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -304,6 +304,7 @@ static inline void rq_init(request_queue_t *q, struct request *rq) | |||
304 | * blk_queue_ordered - does this queue support ordered writes | 304 | * blk_queue_ordered - does this queue support ordered writes |
305 | * @q: the request queue | 305 | * @q: the request queue |
306 | * @ordered: one of QUEUE_ORDERED_* | 306 | * @ordered: one of QUEUE_ORDERED_* |
307 | * @prepare_flush_fn: rq setup helper for cache flush ordered writes | ||
307 | * | 308 | * |
308 | * Description: | 309 | * Description: |
309 | * For journalled file systems, doing ordered writes on a commit | 310 | * For journalled file systems, doing ordered writes on a commit |
@@ -332,6 +333,7 @@ int blk_queue_ordered(request_queue_t *q, unsigned ordered, | |||
332 | return -EINVAL; | 333 | return -EINVAL; |
333 | } | 334 | } |
334 | 335 | ||
336 | q->ordered = ordered; | ||
335 | q->next_ordered = ordered; | 337 | q->next_ordered = ordered; |
336 | q->prepare_flush_fn = prepare_flush_fn; | 338 | q->prepare_flush_fn = prepare_flush_fn; |
337 | 339 | ||
@@ -662,7 +664,7 @@ EXPORT_SYMBOL(blk_queue_bounce_limit); | |||
662 | * Enables a low level driver to set an upper limit on the size of | 664 | * Enables a low level driver to set an upper limit on the size of |
663 | * received requests. | 665 | * received requests. |
664 | **/ | 666 | **/ |
665 | void blk_queue_max_sectors(request_queue_t *q, unsigned short max_sectors) | 667 | void blk_queue_max_sectors(request_queue_t *q, unsigned int max_sectors) |
666 | { | 668 | { |
667 | if ((max_sectors << 9) < PAGE_CACHE_SIZE) { | 669 | if ((max_sectors << 9) < PAGE_CACHE_SIZE) { |
668 | max_sectors = 1 << (PAGE_CACHE_SHIFT - 9); | 670 | max_sectors = 1 << (PAGE_CACHE_SHIFT - 9); |
@@ -2632,6 +2634,7 @@ EXPORT_SYMBOL(blk_put_request); | |||
2632 | /** | 2634 | /** |
2633 | * blk_end_sync_rq - executes a completion event on a request | 2635 | * blk_end_sync_rq - executes a completion event on a request |
2634 | * @rq: request to complete | 2636 | * @rq: request to complete |
2637 | * @error: end io status of the request | ||
2635 | */ | 2638 | */ |
2636 | void blk_end_sync_rq(struct request *rq, int error) | 2639 | void blk_end_sync_rq(struct request *rq, int error) |
2637 | { | 2640 | { |
@@ -3153,7 +3156,7 @@ static int __end_that_request_first(struct request *req, int uptodate, | |||
3153 | if (blk_fs_request(req) && req->rq_disk) { | 3156 | if (blk_fs_request(req) && req->rq_disk) { |
3154 | const int rw = rq_data_dir(req); | 3157 | const int rw = rq_data_dir(req); |
3155 | 3158 | ||
3156 | __disk_stat_add(req->rq_disk, sectors[rw], nr_bytes >> 9); | 3159 | disk_stat_add(req->rq_disk, sectors[rw], nr_bytes >> 9); |
3157 | } | 3160 | } |
3158 | 3161 | ||
3159 | total_bytes = bio_nbytes = 0; | 3162 | total_bytes = bio_nbytes = 0; |