Fix nvlist alocation in vdev_config_generate(). Remove extra #define …

…of ASSERT0.
dweeezil · Oct 14, 2013 · 1a91683 · 1a91683
1 parent c42be2c
commit 1a91683
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
@@ -95,7 +95,6 @@ extern void __assert(const char *, const char *, int);
 #define	ASSERT3P(x, y, z)	VERIFY3P(x, y, z)
 #define	ASSERT0(x)		VERIFY0(x)
 #define	ASSERTV(x)		x
-#define	ASSERT0(x)		VERIFY3_IMPL(x, ==, 0, uintmax_t)
 #endif  /* NDEBUG */
 
 #endif  /* _LIBSPL_ASSERT_H */
diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c
@@ -216,7 +216,7 @@ vdev_config_generate(spa_t *spa, vdev_t *vd, boolean_t getstats,
 {
 	nvlist_t *nv = NULL;
 
-	nv = fnvlist_alloc();
+	VERIFY0(nvlist_alloc(&nv, NV_UNIQUE_NAME, KM_PUSHPAGE));
 
 	fnvlist_add_string(nv, ZPOOL_CONFIG_TYPE, vd->vdev_ops->vdev_op_type);
 	if (!(flags & (VDEV_CONFIG_SPARE | VDEV_CONFIG_L2CACHE)))