We shouldn't call remove_partitions until we have made a really firm
decision to include the device into the array.
Signed-off-by: NeilBrown <neilb@suse.de>
}
dfd = dev_open(devname, O_RDWR|O_EXCL);
}
dfd = dev_open(devname, O_RDWR|O_EXCL);
- remove_partitions(dfd);
-
tst = dup_super(st);
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
tst = dup_super(st);
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
int dfd;
dfd = dev_open(devname, O_RDWR|O_EXCL);
int dfd;
dfd = dev_open(devname, O_RDWR|O_EXCL);
- remove_partitions(dfd);
-
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
devname);
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
devname);
j = chosen_drive;
if (j >= 0 /* && devices[j].uptodate */) {
j = chosen_drive;
if (j >= 0 /* && devices[j].uptodate */) {
+ int dfd = dev_open(devices[j].devname,
+ O_RDWR|O_EXCL);
+ if (dfd >= 0) {
+ remove_partitions(dfd);
+ close(dfd);
+ }
rv = add_disk(mdfd, st, content, &devices[j].i);
if (rv) {
rv = add_disk(mdfd, st, content, &devices[j].i);
if (rv) {