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

Fix GEOM_SHSEC orphanization.

Browse Source 
Previous code closed and destroyed consumer even with I/O in progress.
This patch postpones the destruction till the last close, identical to
GEOM_STRIPE, since they seem to have common origin.

MFC after:	2 weeks
Sponsored by:	iXsystems, Inc.
This commit is contained in:
Alexander Motin 2019-12-28 23:21:53 +00:00
parent 727150ff03
commit 6a8eef35b5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=356162
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/geom/shsec/g_shsec.c
View File

@ -165,7 +165,7 @@ g_shsec_remove_disk(struct g_consumer *cp)
}
if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0)
g_access(cp, -cp->acr, -cp->acw, -cp->ace);
return;
g_detach(cp);
g_destroy_consumer(cp);
}
@ -191,7 +191,7 @@ g_shsec_orphan(struct g_consumer *cp)
static int
g_shsec_access(struct g_provider *pp, int dr, int dw, int de)
{
struct g_consumer *cp1, *cp2;
struct g_consumer *cp1, *cp2, *tmp;
struct g_shsec_softc *sc;
struct g_geom *gp;
int error;
@ -222,21 +222,25 @@ g_shsec_access(struct g_provider *pp, int dr, int dw, int de)
de--;
error = ENXIO;
LIST_FOREACH(cp1, &gp->consumer, consumer) {
LIST_FOREACH_SAFE(cp1, &gp->consumer, consumer, tmp) {
error = g_access(cp1, dr, dw, de);
if (error == 0)
continue;
/*
* If we fail here, backout all previous changes.
*/
LIST_FOREACH(cp2, &gp->consumer, consumer) {
if (cp1 == cp2)
return (error);
g_access(cp2, -dr, -dw, -de);
if (error != 0)
goto fail;
if (cp1->acr == 0 && cp1->acw == 0 && cp1->ace == 0 &&
cp1->flags & G_CF_ORPHAN) {
g_detach(cp1);
g_destroy_consumer(cp1);
}
/* NOTREACHED */
}
return (error);
fail:
/* If we fail here, backout all previous changes. */
LIST_FOREACH(cp2, &gp->consumer, consumer) {
if (cp1 == cp2)
break;
g_access(cp2, -dr, -dw, -de);
}
return (error);
}