---

yaml --- r: 8323 b: refs/heads/master c: 7b1e35f h: refs/heads/master i: 8321: 2529079 8319: 766fbd0 v: v3
git-mirror · Sep 9, 2005 · 5452ea2 · 5452ea2
1 parent bf623ba
commit 5452ea2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3178b0dbdf67322f6506582e494bdf553cc85c32
+refs/heads/master: 7b1e35f6d666693e8f376ce02242efca3ec09aaf
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
@@ -2226,8 +2226,11 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
 			       mdname(mddev));
 			return -EINVAL;
 		}
-		rdev = md_import_device(dev, mddev->major_version,
-					mddev->minor_version);
+		if (mddev->persistent)
+			rdev = md_import_device(dev, mddev->major_version,
+						mddev->minor_version);
+		else
+			rdev = md_import_device(dev, -1, -1);
 		if (IS_ERR(rdev)) {
 			printk(KERN_WARNING 
 				"md: md_import_device returned %ld\n",