--- drivers/md/linear.c

+++ drivers/md/linear.c

@@ -172,12 +172,14 @@ static linear_conf_t *linear_conf(mddev_

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_phys_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_sectors(mddev->queue, PAGE_SIZE>>9);

+ if (rdev->bdev->bd_disk->queue->merge_bvec_fn) {

+ blk_queue_max_phys_segments(mddev->queue, 1);

+ blk_queue_segment_boundary(mddev->queue,

+ PAGE_CACHE_SIZE - 1);

+ }

conf->array_sectors += rdev->sectors;

cnt++;