diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2009-07-01 11:13:45 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-07-01 11:13:45 +1000 |
| commit | 8f6c2e4b325a8e9f8f47febb2fd0ed4fae7d45a9 (patch) | |
| tree | 6e383e2ec48b5c90fe07325a7f6ab38ea1a97dfa /drivers/md/multipath.c | |
| parent | 5a4f13fad1ab5bd08dea78fc55321e429d83cddf (diff) | |
| download | kernel_samsung_smdk4412-8f6c2e4b325a8e9f8f47febb2fd0ed4fae7d45a9.zip kernel_samsung_smdk4412-8f6c2e4b325a8e9f8f47febb2fd0ed4fae7d45a9.tar.gz kernel_samsung_smdk4412-8f6c2e4b325a8e9f8f47febb2fd0ed4fae7d45a9.tar.bz2 | |
md: Use new topology calls to indicate alignment and I/O sizes
Switch MD over to the new disk_stack_limits() function which checks for
aligment and adjusts preferred I/O sizes when stacking.
Also indicate preferred I/O sizes where applicable.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/multipath.c')
| -rw-r--r-- | drivers/md/multipath.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index cbe368f..237fe3f 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c @@ -294,7 +294,8 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev) for (path = first; path <= last; path++) if ((p=conf->multipaths+path)->rdev == NULL) { q = rdev->bdev->bd_disk->queue; - blk_queue_stack_limits(mddev->queue, q); + 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 @@ -463,9 +464,9 @@ static int multipath_run (mddev_t *mddev) disk = conf->multipaths + disk_idx; disk->rdev = rdev; + disk_stack_limits(mddev->gendisk, rdev->bdev, + rdev->data_offset << 9); - blk_queue_stack_limits(mddev->queue, - rdev->bdev->bd_disk->queue); /* as we don't honour merge_bvec_fn, we must never risk * violating it, not that we ever expect a device with * a merge_bvec_fn to be involved in multipath */ |