Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Jes Sorensen 2011-10-22 11:32:52 +11:00 committed by NeilBrown
parent 015da8f5a8
commit e06af9dd62
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Create.c
View File

@ -554,14 +554,16 @@ int Create(struct supertype *st, char *mddev,
/* We need to create the device */
map_lock(&map);
mdfd = create_mddev(mddev, name, autof, LOCAL, chosen_name);
if (mdfd < 0)
if (mdfd < 0) {
map_unlock(&map);
return 1;
}
mddev = chosen_name;
vers = md_get_version(mdfd);
if (vers < 9000) {
fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
goto abort;
goto abort_locked;
} else {
mdu_array_info_t inf;
memset(&inf, 0, sizeof(inf));
@ -569,7 +571,7 @@ int Create(struct supertype *st, char *mddev,
if (inf.working_disks != 0) {
fprintf(stderr, Name ": another array by this name"
" 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))
goto abort;
goto abort_locked;
total_slots = info.array.nr_disks;
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",
dv->devname);
st->ss->free_super(st);
goto abort;
goto abort_locked;
}
/* update parent container uuid */
@ -993,6 +995,7 @@ int Create(struct supertype *st, char *mddev,
abort:
map_lock(&map);
abort_locked:
map_remove(&map, fd2devnum(mdfd));
map_unlock(&map);