aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeinz Mauelshagen <heinzm@redhat.com>2016-05-03 13:43:24 -0400
committerShaohua Li <shli@fb.com>2016-05-09 12:24:01 -0400
commit859644f0fa2141b5f7db0e3744999ec3bb5719d3 (patch)
tree22d69e0c48a8336b1a90583a02aae779ae6bb02d
parent092398dce8c2406bfb0c9eebc3e764ff2ddb62a8 (diff)
md: raid10: add prerequisite to run underneath dm-raid
In case md runs underneath the dm-raid target, the mddev does not have a request queue or gendisk, thus avoid accesses to it. This patch adds two missing conditionals to the raid10 personality. Signed-of-by: Heinz Mauelshagen <heinzm@redhat.com> Signed-off-by: Shaohua Li <shli@fb.com>
-rw-r--r--drivers/md/raid10.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e3fd725d5c4d..84e24e648165 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3782,8 +3782,10 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
3782 return ret; 3782 return ret;
3783 } 3783 }
3784 md_set_array_sectors(mddev, size); 3784 md_set_array_sectors(mddev, size);
3785 set_capacity(mddev->gendisk, mddev->array_sectors); 3785 if (mddev->queue) {
3786 revalidate_disk(mddev->gendisk); 3786 set_capacity(mddev->gendisk, mddev->array_sectors);
3787 revalidate_disk(mddev->gendisk);
3788 }
3787 if (sectors > mddev->dev_sectors && 3789 if (sectors > mddev->dev_sectors &&
3788 mddev->recovery_cp > oldsize) { 3790 mddev->recovery_cp > oldsize) {
3789 mddev->recovery_cp = oldsize; 3791 mddev->recovery_cp = oldsize;
@@ -4593,8 +4595,10 @@ static void raid10_finish_reshape(struct mddev *mddev)
4593 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); 4595 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
4594 } 4596 }
4595 mddev->resync_max_sectors = size; 4597 mddev->resync_max_sectors = size;
4596 set_capacity(mddev->gendisk, mddev->array_sectors); 4598 if (mddev->queue) {
4597 revalidate_disk(mddev->gendisk); 4599 set_capacity(mddev->gendisk, mddev->array_sectors);
4600 revalidate_disk(mddev->gendisk);
4601 }
4598 } else { 4602 } else {
4599 int d; 4603 int d;
4600 for (d = conf->geo.raid_disks ; 4604 for (d = conf->geo.raid_disks ;