Commit cd586d21 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.15 

Pull MD fix from Song.

* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md: fix a lock order reversal in md_alloc
parents 858560b2 7df835a3

drivers/md/md.c

+0 −5
Original line number Diff line number Diff line
@@ -5700,10 +5700,6 @@ static int md_alloc(dev_t dev, char *name) 
	disk->flags |= GENHD_FL_EXT_DEVT;

	disk->events |= DISK_EVENT_MEDIA_CHANGE;

	mddev->gendisk = disk;

	/* As soon as we call add_disk(), another thread could get

	 * through to md_open, so make sure it doesn't get too far

	 */

	mutex_lock(&mddev->open_mutex);

	add_disk(disk);



	error = kobject_add(&mddev->kobj, &disk_to_dev(disk)->kobj, "%s", "md");
@@ -5718,7 +5714,6 @@ static int md_alloc(dev_t dev, char *name) 
	if (mddev->kobj.sd &&

	    sysfs_create_group(&mddev->kobj, &md_bitmap_group))

		pr_debug("pointless warning\n");

	mutex_unlock(&mddev->open_mutex);

 abort:

	mutex_unlock(&disks_mutex);

	if (!error && mddev->kobj.sd) {