X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzvol.c;h=c6cfac26d4afbb2e42576f87f77023abc32e8485;hb=36f86f73f68548f46eb3229c8adf583d59fa9988;hp=d4d533f0231d0560092921d033d968cba38ebe09;hpb=65d56083b4617a4cade0cff68cbbaf68114169d6;p=zfs.git

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index d4d533f..c6cfac2 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -920,24 +920,20 @@ zvol_first_open(zvol_state_t *zv)
 
 	/* lie and say we're read-only */
 	error = dmu_objset_own(zv->zv_name, DMU_OST_ZVOL, 1, zvol_tag, &os);
-
-	if (locked)
-		mutex_exit(&spa_namespace_lock);
-
 	if (error)
-		return (-error);
+		goto out_mutex;
 
 	error = zap_lookup(os, ZVOL_ZAP_OBJ, "size", 8, 1, &volsize);
 	if (error) {
-	        dmu_objset_disown(os, zvol_tag);
-	        return (-error);
+		dmu_objset_disown(os, zvol_tag);
+		goto out_mutex;
 	}
 
 	zv->zv_objset = os;
 	error = dmu_bonus_hold(os, ZVOL_OBJ, zvol_tag, &zv->zv_dbuf);
 	if (error) {
-	        dmu_objset_disown(os, zvol_tag);
-	        return (-error);
+		dmu_objset_disown(os, zvol_tag);
+		goto out_mutex;
 	}
 
 	set_capacity(zv->zv_disk, volsize >> 9);
@@ -946,13 +942,17 @@ zvol_first_open(zvol_state_t *zv)
 
 	VERIFY(dsl_prop_get_integer(zv->zv_name, "readonly", &ro, NULL) == 0);
 	if (ro || dmu_objset_is_snapshot(os)) {
-                set_disk_ro(zv->zv_disk, 1);
-	        zv->zv_flags |= ZVOL_RDONLY;
+		set_disk_ro(zv->zv_disk, 1);
+		zv->zv_flags |= ZVOL_RDONLY;
 	} else {
-                set_disk_ro(zv->zv_disk, 0);
-	        zv->zv_flags &= ~ZVOL_RDONLY;
+		set_disk_ro(zv->zv_disk, 0);
+		zv->zv_flags &= ~ZVOL_RDONLY;
 	}
 
+out_mutex:
+	if (locked)
+		mutex_exit(&spa_namespace_lock);
+
 	return (-error);
 }