From: Neil Brown <neilb@suse.de>
Date: Fri, 19 Oct 2007 04:03:17 +0000 (+1000)
Subject: Remove partitions from a device before adding it to an array.
X-Git-Tag: mdadm-2.6.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25037aa872006fd4613d97e3d3da3c26c61e708f;p=thirdparty%2Fmdadm.git

Remove partitions from a device before adding it to an array.

The 'remove_partitions' call is in the wrong place and applying
to the wrong file.
---

diff --git a/Manage.c b/Manage.c
index 7a96d450..8150be3e 100644
--- a/Manage.c
+++ b/Manage.c
@@ -306,6 +306,7 @@ int Manage_subdevs(char *devname, int fd,
 					dv->devname, strerror(errno));
 				return 1;
 			}
+			remove_partitions(tfd);
 			if (array.not_persistent==0)
 				st->ss->load_super(st, tfd, &osuper, NULL);
 			/* will use osuper later */
@@ -361,7 +362,6 @@ int Manage_subdevs(char *devname, int fd,
 						close(dfd);
 						continue;
 					}
-					remove_partitions(dfd);
 					close(dfd);
 					break;
 				}