Imported Upstream version 0.6.4.2

[mirror_zfs-debian.git] / module / zfs / spa_history.c

diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c
index 5b82238b90f9a44c7def302ffe58fa7f34aca504..14e681e77d8bbda0074e7c2c9d728f893d374c89 100644 (file)
--- a/module/zfs/spa_history.c
+++ b/module/zfs/spa_history.c
@@ -32,7 +32,6 @@
 #include <sys/dmu_objset.h>
 #include <sys/dsl_dataset.h>
 #include <sys/dsl_dir.h>
-#include <sys/utsname.h>
 #include <sys/cmn_err.h>
 #include <sys/sunddi.h>
 #include <sys/cred.h>
@@ -236,9 +235,8 @@ spa_history_log_sync(void *arg, dmu_tx_t *tx)
 #endif
 
        fnvlist_add_uint64(nvl, ZPOOL_HIST_TIME, gethrestime_sec());
-#ifdef _KERNEL
-       fnvlist_add_string(nvl, ZPOOL_HIST_HOST, utsname.nodename);
-#endif
+       fnvlist_add_string(nvl, ZPOOL_HIST_HOST, utsname()->nodename);
+
        if (nvlist_exists(nvl, ZPOOL_HIST_CMD)) {
                zfs_dbgmsg("command: %s",
                    fnvlist_lookup_string(nvl, ZPOOL_HIST_CMD));
@@ -262,7 +260,7 @@ spa_history_log_sync(void *arg, dmu_tx_t *tx)
        }
 
        VERIFY3U(nvlist_pack(nvl, &record_packed, &reclen, NV_ENCODE_NATIVE,
-           KM_PUSHPAGE), ==, 0);
+           KM_SLEEP), ==, 0);
 
        mutex_enter(&spa->spa_history_lock);
 
@@ -291,9 +289,7 @@ int
 spa_history_log(spa_t *spa, const char *msg)
 {
        int err;
-       nvlist_t *nvl;
-
-       VERIFY0(nvlist_alloc(&nvl, NV_UNIQUE_NAME, KM_PUSHPAGE));
+       nvlist_t *nvl = fnvlist_alloc();
 
        fnvlist_add_string(nvl, ZPOOL_HIST_CMD, msg);
        err = spa_history_log_nvl(spa, nvl);
@@ -318,7 +314,7 @@ spa_history_log_nvl(spa_t *spa, nvlist_t *nvl)
                return (err);
        }
 
-       VERIFY0(nvlist_dup(nvl, &nvarg, KM_PUSHPAGE));
+       VERIFY0(nvlist_dup(nvl, &nvarg, KM_SLEEP));
        if (spa_history_zone() != NULL) {
                fnvlist_add_string(nvarg, ZPOOL_HIST_ZONE,
                    spa_history_zone());
@@ -440,8 +436,6 @@ log_internal(nvlist_t *nvl, const char *operation, spa_t *spa,
     dmu_tx_t *tx, const char *fmt, va_list adx)
 {
        char *msg;
-       va_list adx1;
-       int size;
 
        /*
         * If this is part of creating a pool, not everything is
@@ -453,15 +447,9 @@ log_internal(nvlist_t *nvl, const char *operation, spa_t *spa,
                return;
        }
 
-       va_copy(adx1, adx);
-       size = vsnprintf(NULL, 0, fmt, adx1) + 1;
-       msg = kmem_alloc(size, KM_PUSHPAGE);
-       va_end(adx1);
-       va_copy(adx1, adx);
-       (void) vsprintf(msg, fmt, adx1);
-       va_end(adx1);
+       msg = kmem_vasprintf(fmt, adx);
        fnvlist_add_string(nvl, ZPOOL_HIST_INT_STR, msg);
-       kmem_free(msg, size);
+       strfree(msg);
 
        fnvlist_add_string(nvl, ZPOOL_HIST_INT_NAME, operation);
        fnvlist_add_uint64(nvl, ZPOOL_HIST_TXG, tx->tx_txg);
@@ -481,7 +469,6 @@ spa_history_log_internal(spa_t *spa, const char *operation,
 {
        dmu_tx_t *htx = tx;
        va_list adx;
-       nvlist_t *nvl;
 
        /* create a tx if we didn't get one */
        if (tx == NULL) {
@@ -493,8 +480,7 @@ spa_history_log_internal(spa_t *spa, const char *operation,
        }
 
        va_start(adx, fmt);
-       VERIFY0(nvlist_alloc(&nvl, NV_UNIQUE_NAME, KM_PUSHPAGE));
-       log_internal(nvl, operation, spa, htx, fmt, adx);
+       log_internal(fnvlist_alloc(), operation, spa, htx, fmt, adx);
        va_end(adx);
 
        /* if we didn't get a tx from the caller, commit the one we made */
@@ -508,12 +494,11 @@ spa_history_log_internal_ds(dsl_dataset_t *ds, const char *operation,
 {
        va_list adx;
        char namebuf[MAXNAMELEN];
-       nvlist_t *nvl;
+       nvlist_t *nvl = fnvlist_alloc();
 
        ASSERT(tx != NULL);
 
        dsl_dataset_name(ds, namebuf);
-       VERIFY0(nvlist_alloc(&nvl, NV_UNIQUE_NAME, KM_PUSHPAGE));
        fnvlist_add_string(nvl, ZPOOL_HIST_DSNAME, namebuf);
        fnvlist_add_uint64(nvl, ZPOOL_HIST_DSID, ds->ds_object);
 
@@ -528,12 +513,11 @@ spa_history_log_internal_dd(dsl_dir_t *dd, const char *operation,
 {
        va_list adx;
        char namebuf[MAXNAMELEN];
-       nvlist_t *nvl;
+       nvlist_t *nvl = fnvlist_alloc();
 
        ASSERT(tx != NULL);
 
        dsl_dir_name(dd, namebuf);
-       VERIFY0(nvlist_alloc(&nvl, NV_UNIQUE_NAME, KM_PUSHPAGE));
        fnvlist_add_string(nvl, ZPOOL_HIST_DSNAME, namebuf);
        fnvlist_add_uint64(nvl, ZPOOL_HIST_DSID,
            dd->dd_phys->dd_head_dataset_obj);
@@ -546,11 +530,12 @@ spa_history_log_internal_dd(dsl_dir_t *dd, const char *operation,
 void
 spa_history_log_version(spa_t *spa, const char *operation)
 {
+       utsname_t *u = utsname();
+
        spa_history_log_internal(spa, operation, NULL,
            "pool version %llu; software version %llu/%d; uts %s %s %s %s",
            (u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION,
-           utsname.nodename, utsname.release, utsname.version,
-           utsname.machine);
+           u->nodename, u->release, u->version, u->machine);
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)