D6908.id17737.diff
No OneTemporary
Actions

Size

812 B

Referenced Files

None

Subscribers

None

D6908.id17737.diff
View Options

	Index: sys/geom/mirror/g_mirror.c
	===================================================================
	--- sys/geom/mirror/g_mirror.c
	+++ sys/geom/mirror/g_mirror.c
	@@ -2121,8 +2121,16 @@
	g_topology_lock();
	g_error_provider(sc->sc_provider, ENXIO);
	mtx_lock(&sc->sc_queue_mtx);
	- while ((bp = bioq_takefirst(&sc->sc_queue)) != NULL)
	- g_io_deliver(bp, ENXIO);
	+ while ((bp = bioq_takefirst(&sc->sc_queue)) != NULL) {
	+ if (bp->bio_to == sc->sc_provider &&
	+ bp->bio_from->geom != sc->sc_sync.ds_geom) {
	+ g_io_deliver(bp, ENXIO);
	+ } else {
	+ if ((bp->bio_cflags & G_MIRROR_BIO_FLAG_SYNC) != 0)
	+ free(bp->bio_data, M_MIRROR);
	+ g_destroy_bio(bp);
	+ }
	+ }
	mtx_unlock(&sc->sc_queue_mtx);
	G_MIRROR_DEBUG(0, "Device %s: provider %s destroyed.", sc->sc_name,
	sc->sc_provider->name);