diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:55:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:55:24 -0700 |
| commit | 31cc1dd344d941358345bd02f24c629dada9b08c (patch) | |
| tree | 9a8cd10e2e633cb83e1c7984adc85f58006dc2ec /drivers/md/linear.c | |
| parent | 961cde93dee2658000ead32abffb8ddf0727abe0 (diff) | |
| parent | 627a2d3c29427637f4c5d31ccc7fcbd8d312cd71 (diff) | |
| download | kernel-crypto-31cc1dd344d941358345bd02f24c629dada9b08c.tar.gz kernel-crypto-31cc1dd344d941358345bd02f24c629dada9b08c.tar.xz kernel-crypto-31cc1dd344d941358345bd02f24c629dada9b08c.zip | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: deal with merge_bvec_fn in component devices better.
Diffstat (limited to 'drivers/md/linear.c')
| -rw-r--r-- | drivers/md/linear.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index af2d39d603c..bb2a23159b2 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c @@ -172,12 +172,14 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) disk_stack_limits(mddev->gendisk, rdev->bdev, rdev->data_offset << 9); /* as we don't honour merge_bvec_fn, we must never risk - * violating it, so limit ->max_sector to one PAGE, as - * a one page request is never in violation. + * violating it, so limit max_segments to 1 lying within + * a single page. */ - if (rdev->bdev->bd_disk->queue->merge_bvec_fn && - queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) - blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); + if (rdev->bdev->bd_disk->queue->merge_bvec_fn) { + blk_queue_max_segments(mddev->queue, 1); + blk_queue_segment_boundary(mddev->queue, + PAGE_CACHE_SIZE - 1); + } conf->array_sectors += rdev->sectors; cnt++; |