D33013.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D33013.diff
View Options

	diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c
	--- a/sys/geom/geom_vfs.c
	+++ b/sys/geom/geom_vfs.c
	@@ -309,9 +309,7 @@
	gp = cp->geom;
	sc = gp->softc;
	vp = cp->private;
	- vn_lock(vp, LK_EXCLUSIVE \| LK_RETRY);
	bufobj_invalbuf(sc->sc_bo, V_SAVE, 0, 0);
	- VOP_UNLOCK(vp);
	sc->sc_bo->bo_private = cp->private;
	gp->softc = NULL;
	mtx_destroy(&sc->sc_mtx);
	diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
	--- a/sys/ufs/ffs/ffs_vfsops.c
	+++ b/sys/ufs/ffs/ffs_vfsops.c
	@@ -1431,6 +1431,7 @@
	taskqueue_free(ump->um_trim_tq);
	free (ump->um_trimhash, M_TRIM);
	}
	+ vn_lock(ump->um_devvp, LK_EXCLUSIVE \| LK_RETRY);
	g_topology_lock();
	g_vfs_close(ump->um_cp);
	g_topology_unlock();
	@@ -1438,7 +1439,6 @@
	ump->um_odevvp->v_bufobj.bo_flag &= ~BO_NOBUFS;
	BO_UNLOCK(&ump->um_odevvp->v_bufobj);
	atomic_store_rel_ptr((uintptr_t *)&ump->um_dev->si_mountpt, 0);
	- vn_lock(ump->um_devvp, LK_EXCLUSIVE \| LK_RETRY);
	mntfs_freevp(ump->um_devvp);
	vrele(ump->um_odevvp);
	dev_rel(ump->um_dev);