diff options
| author | ae <ae@FreeBSD.org> | 2012-05-18 09:19:07 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2012-05-18 09:19:07 +0000 |
| commit | a243137af2073d22d4fc581771aeb8a5330031fc (patch) | |
| tree | a5c7e039289bd81fb0aa087b94213bc0d5b3ff2a /sys/geom/mirror | |
| parent | eba132f415a1222ad568372f289b15e1d838fb05 (diff) | |
| download | FreeBSD-src-a243137af2073d22d4fc581771aeb8a5330031fc.zip FreeBSD-src-a243137af2073d22d4fc581771aeb8a5330031fc.tar.gz | |
Introduce new device flag G_MIRROR_DEVICE_FLAG_TASTING. It should
protect geom from destroying while it is tasting.
PR: kern/154860
Reviewed by: pjd
MFC after: 1 week
Diffstat (limited to 'sys/geom/mirror')
| -rw-r--r-- | sys/geom/mirror/g_mirror.c | 9 | ||||
| -rw-r--r-- | sys/geom/mirror/g_mirror.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index 1eb46de..fc33db2 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -1693,6 +1693,8 @@ g_mirror_can_destroy(struct g_mirror_softc *sc) gp = sc->sc_geom; if (gp->softc == NULL) return (1); + if ((sc->sc_flags & G_MIRROR_DEVICE_FLAG_TASTING) != 0) + return (0); LIST_FOREACH(cp, &gp->consumer, consumer) { if (g_mirror_is_busy(sc, cp)) return (0); @@ -3054,6 +3056,7 @@ g_mirror_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) G_MIRROR_DEBUG(1, "Adding disk %s to %s.", pp->name, gp->name); g_topology_unlock(); sx_xlock(&sc->sc_lock); + sc->sc_flags |= G_MIRROR_DEVICE_FLAG_TASTING; error = g_mirror_add_disk(sc, pp, &md); if (error != 0) { G_MIRROR_DEBUG(0, "Cannot add disk %s to %s (error=%d).", @@ -3066,6 +3069,12 @@ g_mirror_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) } gp = NULL; } + sc->sc_flags &= ~G_MIRROR_DEVICE_FLAG_TASTING; + if ((sc->sc_flags & G_MIRROR_DEVICE_FLAG_DESTROY) != 0) { + g_mirror_destroy(sc, G_MIRROR_DESTROY_HARD); + g_topology_lock(); + return (NULL); + } sx_xunlock(&sc->sc_lock); g_topology_lock(); return (gp); diff --git a/sys/geom/mirror/g_mirror.h b/sys/geom/mirror/g_mirror.h index 8cd9a69..c6fec74 100644 --- a/sys/geom/mirror/g_mirror.h +++ b/sys/geom/mirror/g_mirror.h @@ -157,6 +157,7 @@ struct g_mirror_event { #define G_MIRROR_DEVICE_FLAG_DESTROY 0x0100000000000000ULL #define G_MIRROR_DEVICE_FLAG_WAIT 0x0200000000000000ULL #define G_MIRROR_DEVICE_FLAG_DESTROYING 0x0400000000000000ULL +#define G_MIRROR_DEVICE_FLAG_TASTING 0x0800000000000000ULL #define G_MIRROR_DEVICE_STATE_STARTING 0 #define G_MIRROR_DEVICE_STATE_RUNNING 1 |
