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

Remove the topology lock from disk_gone(), it might be called with regular

Browse Source 
mutexes held and the topology lock is an sx lock.

The topology lock was there to protect traversing through the list of providers
of disk's geom, but it seems that disk's geom has always exactly one provider.

Change the code to call g_wither_provider() for this one provider, which is
safe to do without holding the topology lock and assert that there is indeed
only one provider.

Discussed with:	ken
MFC after:	1 week
This commit is contained in:
pjd 2012-09-28 08:22:51 +00:00
parent a93e845e54
commit 785571bd2b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/geom/geom_disk.c
View File

@ -635,13 +635,15 @@ disk_gone(struct disk *dp)
struct g_geom *gp;
struct g_provider *pp;
g_topology_lock();
gp = dp->d_geom;
if (gp != NULL) {
LIST_FOREACH(pp, &gp->provider, provider)
pp = LIST_FIRST(&gp->provider);
if (pp != NULL) {
KASSERT(LIST_NEXT(pp, provider) == NULL,
("geom %p has more than one provider", gp));
g_wither_provider(pp, ENXIO);
}
}
g_topology_unlock();
}
void