md: raid5: add prerequisite to run underneath dm-raid
authorHeinz Mauelshagen <heinzm@redhat.com>
Tue, 3 May 2016 20:15:31 +0000 (22:15 +0200)
committerShaohua Li <shli@fb.com>
Mon, 9 May 2016 16:24:02 +0000 (09:24 -0700)
In case md runs underneath the dm-raid target, the mddev does not have
a request queue or gendisk, thus avoid accesses.

This patch adds a missing conditional to the raid5 personality.

Signed-of-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Shaohua Li <shli@fb.com>
drivers/md/raid5.c

index e48c262ce0322fe504d92d14403c70cb3ef4a608..4d31b235a888b5dc979cf585bc74cda78bbaeb06 100644 (file)
@@ -7572,8 +7572,10 @@ static void raid5_finish_reshape(struct mddev *mddev)
 
                if (mddev->delta_disks > 0) {
                        md_set_array_sectors(mddev, raid5_size(mddev, 0, 0));
-                       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;
                        spin_lock_irq(&conf->device_lock);