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

Commit d0fae18f authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

md: clean up irregularity with raid autodetect 



When a raid1 array is stopped, all components currently get added to the list
for auto-detection.  However we should really only add components that were
found by autodetection in the first place.  So add a flag to record that
information, and use it.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1801f85

drivers/md/md.c

+3 −1
Original line number Diff line number Diff line
@@ -1503,6 +1503,7 @@ static void export_rdev(mdk_rdev_t * rdev) 
	free_disk_sb(rdev);

	list_del_init(&rdev->same_set);

#ifndef MODULE

	if (test_bit(AutoDetected, &rdev->flags))

		md_autodetect_dev(rdev->bdev->bd_dev);

#endif

	unlock_rdev(rdev);
@@ -6025,6 +6026,7 @@ static void autostart_arrays(int part) 
			MD_BUG();

			continue;

		}

		set_bit(AutoDetected, &rdev->flags);

		list_add(&rdev->same_set, &pending_raid_disks);

		i_passed++;

	}

include/linux/raid/md_k.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ struct mdk_rdev_s 
#define	BarriersNotsupp	5		/* BIO_RW_BARRIER is not supported */

#define	AllReserved	6		/* If whole device is reserved for

					 * one array */

#define	AutoDetected	7		/* added by auto-detect */



	int desc_nr;			/* descriptor index in the superblock */

	int raid_disk;			/* role of device in array */