D35036.id105350.diff
No OneTemporary
Actions

Size

967 B

Referenced Files

None

Subscribers

None

D35036.id105350.diff
View Options

	Index: sys/geom/geom_vfs.c
	===================================================================
	--- sys/geom/geom_vfs.c
	+++ sys/geom/geom_vfs.c
	@@ -55,8 +55,8 @@
	struct bufobj *sc_bo;
	struct g_event *sc_event;
	int sc_active;
	- int sc_orphaned;
	- int sc_enxio_active;
	+ bool sc_orphaned;
	+ bool sc_enxio_active;
	};

	static struct buf_ops __g_vfs_bufops = {
	@@ -144,7 +144,7 @@
	sc = cp->geom->softc;
	if (bip->bio_error != 0 && bip->bio_error != EOPNOTSUPP) {
	if ((bp->b_xflags & BX_CVTENXIO) != 0)
	- sc->sc_enxio_active = 1;
	+ sc->sc_enxio_active = true;
	if (sc->sc_enxio_active)
	bip->bio_error = ENXIO;
	g_print_bio("g_vfs_done():", bip, "error = %d",
	@@ -233,7 +233,7 @@
	event = g_alloc_event(M_WAITOK);
	mtx_lock(&sc->sc_mtx);
	KASSERT(sc->sc_event == NULL, ("g_vfs %p already has an event", sc));
	- sc->sc_orphaned = 1;
	+ sc->sc_orphaned = true;
	destroy = (sc->sc_active == 0);
	if (!destroy) {
	sc->sc_event = event;