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

This is a crude bandaid for 5.2 to protect against providers which disappear

Browse Source 
while being tasted.  I can moderately easy trigger this with atapi-cd, but
I do not fully understand the circumstances.
This commit is contained in:
Poul-Henning Kamp 2003-11-15 18:44:43 +00:00
parent d87526cf43
commit b3ecca4d0a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=122762
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/geom/geom_subr.c
View File

@ -57,6 +57,7 @@ struct class_list_head g_classes = LIST_HEAD_INITIALIZER(g_classes);
static struct g_tailq_head geoms = TAILQ_HEAD_INITIALIZER(geoms);
char *g_wait_event, *g_wait_up, *g_wait_down, *g_wait_sim;
static int g_valid_obj(void const *ptr);
struct g_hh00 {
struct g_class *mp;
@ -343,6 +344,14 @@ g_new_provider_event(void *arg, int flag)
continue;
mp->taste(mp, pp, 0);
g_topology_assert();
/*
* XXX: Bandaid for 5.2-RELEASE
* XXX: DO NOT REPLICATE THIS CODE!
*/
if (!g_valid_obj(pp)) {
printf("g_provider %p disappeared while tasting\n", pp);
return;
}
}
}
@ -782,6 +791,35 @@ g_getattr__(const char *attr, struct g_consumer *cp, void *var, int len)
return (0);
}
/*
* XXX: Bandaid for 5.2.
* XXX: DO NOT EVEN THINK ABOUT CALLING THIS FUNCTION!
*/
static int
g_valid_obj(void const *ptr)
{
struct g_class *mp;
struct g_geom *gp;
struct g_consumer *cp;
struct g_provider *pp;
LIST_FOREACH(mp, &g_classes, class) {
if (ptr == mp)
return (1);
LIST_FOREACH(gp, &mp->geom, geom) {
if (ptr == gp)
return (1);
LIST_FOREACH(cp, &gp->consumer, consumer)
if (ptr == cp)
return (1);
LIST_FOREACH(pp, &gp->provider, provider)
if (ptr == pp)
return (1);
}
}
return(0);
}
/*
* Check if the given pointer is a live object
*/