On 05/03/2016 07:51 PM, James Bottomley wrote:
On Tue, 2016-05-03 at 19:42 +0200, heinzm@xxxxxxxxxx wrote:
From: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
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.
-EWRONGLIST. drivers/md is handled by linux-raid@xxxxxxxxxxxxxxx
Sorry for the noise...
James
Signed-of-by: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
---
drivers/md/raid10.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e3fd725..84e24e6 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)
return ret;
}
md_set_array_sectors(mddev, size);
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
if (sectors > mddev->dev_sectors &&
mddev->recovery_cp > oldsize) {
mddev->recovery_cp = oldsize;
@@ -4593,8 +4595,10 @@ static void raid10_finish_reshape(struct mddev
*mddev)
set_bit(MD_RECOVERY_NEEDED, &mddev
->recovery);
}
mddev->resync_max_sectors = size;
- set_capacity(mddev->gendisk, mddev->array_sectors);
- revalidate_disk(mddev->gendisk);
+ if (mddev->queue) {
+ set_capacity(mddev->gendisk, mddev
->array_sectors);
+ revalidate_disk(mddev->gendisk);
+ }
} else {
int d;
for (d = conf->geo.raid_disks ;
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
