Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed30be07 authored by Jonathan Brassow's avatar Jonathan Brassow Committed by NeilBrown
Browse files

MD RAID10: Fix oops when creating RAID10 arrays via dm-raid.c 



Commit 2863b9eb didn't take into account the changes to add TRIM support to
RAID10 (commit 532a2a3f).  That is, when using dm-raid.c to create the
RAID10 arrays, there is no mddev->gendisk or mddev->queue.  The code added
to support TRIM simply assumes that mddev->queue is available without
checking.  The result is an oops any time dm-raid.c attempts to create a
RAID10 device.

Signed-off-by: default avatarJonathan Brassow <jbrassow@redhat.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 02b898f2

drivers/md/raid10.c

+9 −6
Original line number Diff line number Diff line
@@ -1783,7 +1783,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
		clear_bit(Unmerged, &rdev->flags);

	}

	md_integrity_add_rdev(rdev, mddev);

	if (blk_queue_discard(bdev_get_queue(rdev->bdev)))

	if (mddev->queue && blk_queue_discard(bdev_get_queue(rdev->bdev)))

		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);



	print_conf(conf);
@@ -3613,11 +3613,14 @@ static int run(struct mddev *mddev) 
			discard_supported = true;

	}



	if (mddev->queue) {

		if (discard_supported)

		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);

			queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,

						mddev->queue);

		else

		queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);



			queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD,

						  mddev->queue);

	}

	/* need to check that every block has at least one working mirror */

	if (!enough(conf, -1)) {

		printk(KERN_ERR "md/raid10:%s: not enough operational mirrors.\n",