diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-09-24 16:15:58 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-09-24 16:15:58 +0200 |
| commit | a830744c4e4fe672f224b0560e9faa2adbb4e05a (patch) | |
| tree | 6f82f6721d18051a2cb425667ab2f6c356f43254 /block | |
| parent | 94a8d5caba74211ec76dac80fc6e2d5c391530df (diff) | |
| parent | 6fd5a5b75827964dd9ab3f93af2477e32654eb43 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 1 | ||||
| -rw-r--r-- | block/blk-settings.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 8135228e4b29..1d1b7df79d52 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -34,6 +34,7 @@ #include "blk.h" EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap); +EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete); static int __make_request(struct request_queue *q, struct bio *bio); diff --git a/block/blk-settings.c b/block/blk-settings.c index 83413ff83739..eaf122ff5f16 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -111,7 +111,8 @@ void blk_set_default_limits(struct queue_limits *lim) lim->max_hw_segments = MAX_HW_SEGMENTS; lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK; lim->max_segment_size = MAX_SEGMENT_SIZE; - lim->max_sectors = lim->max_hw_sectors = SAFE_MAX_SECTORS; + lim->max_sectors = BLK_DEF_MAX_SECTORS; + lim->max_hw_sectors = INT_MAX; lim->logical_block_size = lim->physical_block_size = lim->io_min = 512; lim->bounce_pfn = (unsigned long)(BLK_BOUNCE_ANY >> PAGE_SHIFT); lim->alignment_offset = 0; @@ -164,6 +165,7 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) q->unplug_timer.data = (unsigned long)q; blk_set_default_limits(&q->limits); + blk_queue_max_sectors(q, SAFE_MAX_SECTORS); /* * If the caller didn't supply a lock, fall back to our embedded |