Create() don't leave the lock hanging on error
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
015da8f5a8
commit
e06af9dd62
13
Create.c
13
Create.c
|
@ -554,14 +554,16 @@ int Create(struct supertype *st, char *mddev,
|
||||||
/* We need to create the device */
|
/* We need to create the device */
|
||||||
map_lock(&map);
|
map_lock(&map);
|
||||||
mdfd = create_mddev(mddev, name, autof, LOCAL, chosen_name);
|
mdfd = create_mddev(mddev, name, autof, LOCAL, chosen_name);
|
||||||
if (mdfd < 0)
|
if (mdfd < 0) {
|
||||||
|
map_unlock(&map);
|
||||||
return 1;
|
return 1;
|
||||||
|
}
|
||||||
mddev = chosen_name;
|
mddev = chosen_name;
|
||||||
|
|
||||||
vers = md_get_version(mdfd);
|
vers = md_get_version(mdfd);
|
||||||
if (vers < 9000) {
|
if (vers < 9000) {
|
||||||
fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
|
fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
|
||||||
goto abort;
|
goto abort_locked;
|
||||||
} else {
|
} else {
|
||||||
mdu_array_info_t inf;
|
mdu_array_info_t inf;
|
||||||
memset(&inf, 0, sizeof(inf));
|
memset(&inf, 0, sizeof(inf));
|
||||||
|
@ -569,7 +571,7 @@ int Create(struct supertype *st, char *mddev,
|
||||||
if (inf.working_disks != 0) {
|
if (inf.working_disks != 0) {
|
||||||
fprintf(stderr, Name ": another array by this name"
|
fprintf(stderr, Name ": another array by this name"
|
||||||
" is already running.\n");
|
" is already running.\n");
|
||||||
goto abort;
|
goto abort_locked;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -665,7 +667,7 @@ int Create(struct supertype *st, char *mddev,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid))
|
if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid))
|
||||||
goto abort;
|
goto abort_locked;
|
||||||
|
|
||||||
total_slots = info.array.nr_disks;
|
total_slots = info.array.nr_disks;
|
||||||
st->ss->getinfo_super(st, &info, NULL);
|
st->ss->getinfo_super(st, &info, NULL);
|
||||||
|
@ -910,7 +912,7 @@ int Create(struct supertype *st, char *mddev,
|
||||||
Name ": Failed to write metadata to %s\n",
|
Name ": Failed to write metadata to %s\n",
|
||||||
dv->devname);
|
dv->devname);
|
||||||
st->ss->free_super(st);
|
st->ss->free_super(st);
|
||||||
goto abort;
|
goto abort_locked;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update parent container uuid */
|
/* update parent container uuid */
|
||||||
|
@ -993,6 +995,7 @@ int Create(struct supertype *st, char *mddev,
|
||||||
|
|
||||||
abort:
|
abort:
|
||||||
map_lock(&map);
|
map_lock(&map);
|
||||||
|
abort_locked:
|
||||||
map_remove(&map, fd2devnum(mdfd));
|
map_remove(&map, fd2devnum(mdfd));
|
||||||
map_unlock(&map);
|
map_unlock(&map);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue