d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove assertion of topology lock remaining from 7.x gvinum. It is not needed,

Browse Source 
as the renaming only changes internal gvinum names and will not alter the geom
  topology.
- The topology lock was not held when calling g_wither_geom after renaming.
This commit is contained in:
Ulf Lilleengen 2009-04-18 16:36:27 +00:00
parent 6f20ea67ac
commit 697ab8be86
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/geom/vinum/geom_vinum.c
View File

@ -897,7 +897,9 @@ gv_worker(void *arg)
v->name);
break;
}
g_topology_lock();
g_wither_provider(v->provider, ENOENT);
g_topology_unlock();
v->provider = NULL;
gv_post_event(sc, GV_EVENT_SETUP_OBJECTS, sc,
NULL, 0, 0);

4
sys/geom/vinum/geom_vinum_rename.c
View File

@ -125,7 +125,6 @@ gv_rename_drive(struct gv_softc *sc, struct gv_drive *d, char *newname,
{
struct gv_sd *s;
g_topology_assert();
KASSERT(d != NULL, ("gv_rename_drive: NULL d"));
if (gv_object_type(sc, newname) != GV_ERR_NOTFOUND) {
@ -151,7 +150,6 @@ gv_rename_plex(struct gv_softc *sc, struct gv_plex *p, char *newname, int flags)
char *ptr;
int err;
g_topology_assert();
KASSERT(p != NULL, ("gv_rename_plex: NULL p"));
if (gv_object_type(sc, newname) != GV_ERR_NOTFOUND) {
@ -203,7 +201,6 @@ gv_rename_sd(struct gv_softc *sc, struct gv_sd *s, char *newname, int flags)
{
char *dot1, *dot2;
g_topology_assert();
KASSERT(s != NULL, ("gv_rename_sd: NULL s"));
if (gv_object_type(sc, newname) != GV_ERR_NOTFOUND) {
@ -231,7 +228,6 @@ gv_rename_vol(struct gv_softc *sc, struct gv_volume *v, char *newname,
char newplex[GV_MAXPLEXNAME], *ptr;
int err;
g_topology_assert();
KASSERT(v != NULL, ("gv_rename_vol: NULL v"));
pp = v->provider;
KASSERT(pp != NULL, ("gv_rename_vol: NULL pp"));