Merge pull request openzfs#38 from truenas/fix-zvol-open-locking

FreeBSD: Fix zvol_geom_open locking
anodos325 · Jan 25, 2022 · 53d3c4f · 53d3c4f
2 parents c42146a + 84bba4e
commit 53d3c4f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/module/os/freebsd/zfs/zvol_os.c b/module/os/freebsd/zfs/zvol_os.c
@@ -928,8 +928,8 @@ zvol_cdev_open(struct cdev *dev, int flags, int fmt, struct thread *td)
 		 */
 		if (!mutex_owned(&spa_namespace_lock)) {
 			if (!mutex_tryenter(&spa_namespace_lock)) {
-				rw_exit(&zvol_state_lock);
-				mutex_enter(&spa_namespace_lock);
+				mutex_exit(&zv->zv_state_lock);
+				rw_exit(&zv->zv_suspend_lock);
 				kern_yield(PRI_USER);
 				goto retry;
 			} else {