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

Missed part of r356162.

Browse Source 
If we postpone consumer destruction till close, then the close calls should
not be ignored.  Delay geom withering till the last close too.

MFC after:	2 weeks
X-MFC-with:	r356162
Sponsored by:	iXsystems, Inc.
This commit is contained in:
Alexander Motin 2019-12-29 19:33:41 +00:00
parent 1d301810d3
commit cfdb91850c
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,7 @@ g_shsec_orphan(struct g_consumer *cp)
g_shsec_remove_disk(cp); g_shsec_remove_disk(cp);
/* If there are no valid disks anymore, remove device. */ /* If there are no valid disks anymore, remove device. */
if (g_shsec_nvalid(sc) == 0) if (LIST_EMPTY(&gp->consumer))
g_shsec_destroy(sc, 1); g_shsec_destroy(sc, 1);
} }
@ -199,21 +199,6 @@ g_shsec_access(struct g_provider *pp, int dr, int dw, int de)
gp = pp->geom; gp = pp->geom;
sc = gp->softc; sc = gp->softc;
if (sc == NULL) {
/*
* It looks like geom is being withered.
* In that case we allow only negative requests.
*/
KASSERT(dr <= 0 && dw <= 0 && de <= 0,
("Positive access request (device=%s).", pp->name));
if ((pp->acr + dr) == 0 && (pp->acw + dw) == 0 &&
(pp->ace + de) == 0) {
G_SHSEC_DEBUG(0, "Device %s definitely destroyed.",
gp->name);
}
return (0);
}
/* On first open, grab an extra "exclusive" bit */ /* On first open, grab an extra "exclusive" bit */
if (pp->acr == 0 && pp->acw == 0 && pp->ace == 0) if (pp->acr == 0 && pp->acw == 0 && pp->ace == 0)
de++; de++;
@ -232,6 +217,11 @@ g_shsec_access(struct g_provider *pp, int dr, int dw, int de)
g_destroy_consumer(cp1); g_destroy_consumer(cp1);
} }
} }
/* If there are no valid disks anymore, remove device. */
if (LIST_EMPTY(&gp->consumer))
g_shsec_destroy(sc, 1);
return (error); return (error);
fail: fail: