From f9a7332118c0bfa6df0614935c9bbf4cc5d83c64 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 21 Jun 2010 21:27:25 -0700
Subject: [PATCH] Update kmem_asprintf() and kmem_vasprintf() implementation

On a Linux system simply use the native aprintf and vasprintf
functions respectively.  Also update the call points to correctly
use va_copy() or va_start() as appropriate.
---
 lib/libzpool/include/sys/zfs_context.h |  1 +
 lib/libzpool/kernel.c                  | 28 ++++++++++++++------------
 module/zfs/spa_history.c               |  5 ++++-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/lib/libzpool/include/sys/zfs_context.h b/lib/libzpool/include/sys/zfs_context.h
index 7f736efb71..58fd12c04a 100644
--- a/lib/libzpool/include/sys/zfs_context.h
+++ b/lib/libzpool/include/sys/zfs_context.h
@@ -562,6 +562,7 @@ typedef struct callb_cpr {
 #define	zone_dataset_visible(x, y)	(1)
 #define	INGLOBALZONE(z)			(1)
 
+extern char *kmem_vasprintf(const char *fmt, va_list adx);
 extern char *kmem_asprintf(const char *fmt, ...);
 #define	strfree(str) kmem_free((str), strlen(str)+1)
 
diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index f9488177e3..b542d1fc34 100644
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@ -1086,25 +1086,27 @@ ksiddomain_rele(ksiddomain_t *ksid)
 	umem_free(ksid, sizeof (ksiddomain_t));
 }
 
-/*
- * Do not change the length of the returned string; it must be freed
- * with strfree().
- */
+char *
+kmem_vasprintf(const char *fmt, va_list adx)
+{
+	char *buf = NULL;
+	va_list adx_copy;
+
+	va_copy(adx_copy, adx);
+	VERIFY(vasprintf(&buf, fmt, adx_copy) != -1);
+	va_end(adx_copy);
+
+	return (buf);
+}
+
 char *
 kmem_asprintf(const char *fmt, ...)
 {
-	int size;
+	char *buf = NULL;
 	va_list adx;
-	char *buf;
 
 	va_start(adx, fmt);
-	size = vsnprintf(NULL, 0, fmt, adx) + 1;
-	va_end(adx);
-
-	buf = kmem_alloc(size, KM_SLEEP);
-
-	va_start(adx, fmt);
-	size = vsnprintf(buf, size, fmt, adx);
+	VERIFY(vasprintf(&buf, fmt, adx) != -1);
 	va_end(adx);
 
 	return (buf);
diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c
index b7b5e32271..ce7d378c6f 100644
--- a/module/zfs/spa_history.c
+++ b/module/zfs/spa_history.c
@@ -428,6 +428,7 @@ log_internal(history_internal_events_t event, spa_t *spa,
     dmu_tx_t *tx, const char *fmt, va_list adx)
 {
 	history_arg_t *ha;
+	va_list adx_copy;
 
 	/*
 	 * If this is part of creating a pool, not everything is
@@ -437,7 +438,9 @@ log_internal(history_internal_events_t event, spa_t *spa,
 		return;
 
 	ha = kmem_alloc(sizeof (history_arg_t), KM_SLEEP);
-	ha->ha_history_str = kmem_asprintf(fmt, adx);
+	va_copy(adx_copy, adx);
+	ha->ha_history_str = kmem_vasprintf(fmt, adx_copy);
+	va_end(adx_copy);
 	ha->ha_log_type = LOG_INTERNAL;
 	ha->ha_event = event;
 	ha->ha_zone = NULL;