[Midnightbsd-cvs] src [8539] trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: zfs: solaris does not have KM_ZERO, kmem_zalloc shoudl be used.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 19 09:52:16 EDT 2016


Revision: 8539
          http://svnweb.midnightbsd.org/src/?rev=8539
Author:   laffer1
Date:     2016-09-19 09:52:16 -0400 (Mon, 19 Sep 2016)
Log Message:
-----------
zfs: solaris does not have KM_ZERO, kmem_zalloc shoudl be used.

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

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	2016-09-19 13:51:51 UTC (rev 8538)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	2016-09-19 13:52:16 UTC (rev 8539)
@@ -3799,7 +3799,7 @@
 	nvlist_lookup_uint64_array(best_cfg, ZPOOL_CONFIG_HOLE_ARRAY,
 	    &holes, &nholes);
 
-	tops = kmem_alloc(nchildren * sizeof(void *), KM_SLEEP | KM_ZERO);
+	tops = kmem_zalloc(nchildren * sizeof(void *), KM_SLEEP);
 	for (i = 0; i < nchildren; i++) {
 		if (i >= count)
 			break;

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	2016-09-19 13:51:51 UTC (rev 8538)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	2016-09-19 13:52:16 UTC (rev 8539)
@@ -300,8 +300,8 @@
 
 	if (id < *count)
 		return;
-	new_configs = kmem_alloc((id + 1) * sizeof(nvlist_t *),
-	    KM_SLEEP | KM_ZERO);
+	new_configs = kmem_zalloc((id + 1) * sizeof(nvlist_t *),
+	    KM_SLEEP);
 	for (i = 0; i < *count; i++)
 		new_configs[i] = (*configs)[i];
 	if (*configs != NULL)



More information about the Midnightbsd-cvs mailing list