summaryrefslogtreecommitdiff
path: root/drivers/md/faulty.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-16 13:41:51 +0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-16 13:41:51 +0400
commit3c3dd225819112e56554162c6b37e61a31924e0c (patch)
tree5bcd3a63010af2cd5bb946b5af21ef27f1dcfe3c /drivers/md/faulty.c
parenta915d4ca24b814daee9cddbc42cd41f59fe4fa8f (diff)
parent3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff)
downloadlinux-3c3dd225819112e56554162c6b37e61a31924e0c.tar.xz
Merge tag 'v3.7-rc4'
Merge Linux 3.7-rc4 to get fixes for CMA.
Diffstat (limited to 'drivers/md/faulty.c')
-rw-r--r--drivers/md/faulty.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 45135f69509c..5e7dc772f5de 100644
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -315,8 +315,11 @@ static int run(struct mddev *mddev)
}
conf->nfaults = 0;
- rdev_for_each(rdev, mddev)
+ rdev_for_each(rdev, mddev) {
conf->rdev = rdev;
+ disk_stack_limits(mddev->gendisk, rdev->bdev,
+ rdev->data_offset << 9);
+ }
md_set_array_sectors(mddev, faulty_size(mddev, 0, 0));
mddev->private = conf;