From f6c76bdb199299cca8a47f79b70fd27a2d47ca60 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 4 Mar 2008 14:29:31 -0800 Subject: [PATCH] --- yaml --- r: 86843 b: refs/heads/master c: d0fae18f1b53a1d39135a968792be034bdf7ff26 h: refs/heads/master i: 86841: f017375f8523368457fa3a62bea97947c0d88b0e 86839: 5541b3e355b80a8e62369e3e354840fea01d2341 v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 4 +++- trunk/include/linux/raid/md_k.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5e27e8f68b15..5eeca9d51291 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1801f858e57f87a7f79914346921cc729632295 +refs/heads/master: d0fae18f1b53a1d39135a968792be034bdf7ff26 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index b375de5c1af2..a71241c5ae72 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -1503,7 +1503,8 @@ static void export_rdev(mdk_rdev_t * rdev) free_disk_sb(rdev); list_del_init(&rdev->same_set); #ifndef MODULE - md_autodetect_dev(rdev->bdev->bd_dev); + if (test_bit(AutoDetected, &rdev->flags)) + md_autodetect_dev(rdev->bdev->bd_dev); #endif unlock_rdev(rdev); kobject_put(&rdev->kobj); @@ -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++; } diff --git a/trunk/include/linux/raid/md_k.h b/trunk/include/linux/raid/md_k.h index 85a068bab625..7bb6d1abf71e 100644 --- a/trunk/include/linux/raid/md_k.h +++ b/trunk/include/linux/raid/md_k.h @@ -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 */