diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2009-09-18 22:54:37 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-01 21:15:45 +0200 |
| commit | 80ddf247c84fbd7f4371dd15bbbff0adb44a8708 (patch) | |
| tree | 77f60af44099d1181ad87bdb2e61cf605df1b78a /block | |
| parent | 9f792d9f58496161b1b201e2ca440a6b6e116c39 (diff) | |
| download | linux-stable-80ddf247c84fbd7f4371dd15bbbff0adb44a8708.tar.gz linux-stable-80ddf247c84fbd7f4371dd15bbbff0adb44a8708.tar.bz2 linux-stable-80ddf247c84fbd7f4371dd15bbbff0adb44a8708.zip | |
block: Set max_sectors correctly for stacking devices
The topology changes unintentionally caused SAFE_MAX_SECTORS to be set
for stacking devices. Set the default limit to BLK_DEF_MAX_SECTORS and
provide SAFE_MAX_SECTORS in blk_queue_make_request() for legacy hw
drivers that depend on the old behavior.
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-settings.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 83413ff83739..cd9b7302dfc1 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -111,7 +111,7 @@ 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 = lim->max_hw_sectors = BLK_DEF_MAX_SECTORS; 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 +164,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 |