[Midnightbsd-cvs] src [8229] trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c: zvol: set mediasize in geom provider right upon its creation

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 17 16:32:47 EDT 2016


Revision: 8229
          http://svnweb.midnightbsd.org/src/?rev=8229
Author:   laffer1
Date:     2016-09-17 16:32:47 -0400 (Sat, 17 Sep 2016)
Log Message:
-----------
zvol: set mediasize in geom provider right upon its creation

Modified Paths:
--------------
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	2016-09-17 20:31:21 UTC (rev 8228)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	2016-09-17 20:32:47 UTC (rev 8229)
@@ -482,6 +482,7 @@
 	zvol_state_t *zv;
 	objset_t *os;
 	dmu_object_info_t doi;
+	uint64_t volsize;
 	int error;
 
 	ZFS_LOG(1, "Creating ZVOL %s...", name);
@@ -542,9 +543,20 @@
 	zv = zs->zss_data = kmem_zalloc(sizeof (zvol_state_t), KM_SLEEP);
 #else	/* !sun */
 
+	error = zap_lookup(os, ZVOL_ZAP_OBJ, "size", 8, 1, &volsize);
+	if (error) {
+		ASSERT(error == 0);
+		dmu_objset_disown(os, zvol_tag);
+		mutex_exit(&spa_namespace_lock);
+		return (error);
+	}
+
 	DROP_GIANT();
 	g_topology_lock();
 	zv = zvol_geom_create(name);
+	zv->zv_volsize = volsize;
+	zv->zv_provider->mediasize = zv->zv_volsize;
+
 #endif	/* !sun */
 
 	(void) strlcpy(zv->zv_name, name, MAXPATHLEN);



More information about the Midnightbsd-cvs mailing list