Add -p switch to "zpool get"

[zfs.git] / module / zfs / spa.c

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index e022c32..65f78b7 100644 (file)
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -64,6 +64,7 @@
 #include <sys/zfs_ioctl.h>
 #include <sys/dsl_scan.h>
 #include <sys/zfeature.h>
+#include <sys/zvol.h>
 
 #ifdef _KERNEL
 #include <sys/bootprops.h>
@@ -920,12 +921,37 @@ spa_taskq_dispatch_ent(spa_t *spa, zio_type_t t, zio_taskq_type_t q,
        if (tqs->stqs_count == 1) {
                tq = tqs->stqs_taskq[0];
        } else {
-               tq = tqs->stqs_taskq[gethrtime() % tqs->stqs_count];
+               tq = tqs->stqs_taskq[((uint64_t)gethrtime()) % tqs->stqs_count];
        }
 
        taskq_dispatch_ent(tq, func, arg, flags, ent);
 }
 
+/*
+ * Same as spa_taskq_dispatch_ent() but block on the task until completion.
+ */
+void
+spa_taskq_dispatch_sync(spa_t *spa, zio_type_t t, zio_taskq_type_t q,
+    task_func_t *func, void *arg, uint_t flags)
+{
+       spa_taskqs_t *tqs = &spa->spa_zio_taskq[t][q];
+       taskq_t *tq;
+       taskqid_t id;
+
+       ASSERT3P(tqs->stqs_taskq, !=, NULL);
+       ASSERT3U(tqs->stqs_count, !=, 0);
+
+       if (tqs->stqs_count == 1) {
+               tq = tqs->stqs_taskq[0];
+       } else {
+               tq = tqs->stqs_taskq[((uint64_t)gethrtime()) % tqs->stqs_count];
+       }
+
+       id = taskq_dispatch(tq, func, arg, flags);
+       if (id)
+               taskq_wait_id(tq, id);
+}
+
 static void
 spa_create_zio_taskqs(spa_t *spa)
 {
@@ -1831,7 +1857,7 @@ spa_load_verify_done(zio_t *zio)
 /*ARGSUSED*/
 static int
 spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    arc_buf_t *pbuf, const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        if (bp != NULL) {
                zio_t *rio = arg;
@@ -2831,6 +2857,7 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
        spa_load_state_t state = SPA_LOAD_OPEN;
        int error;
        int locked = B_FALSE;
+       int firstopen = B_FALSE;
 
        *spapp = NULL;
 
@@ -2854,6 +2881,8 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
        if (spa->spa_state == POOL_STATE_UNINITIALIZED) {
                zpool_rewind_policy_t policy;
 
+               firstopen = B_TRUE;
+
                zpool_get_rewind_policy(nvpolicy ? nvpolicy : spa->spa_config,
                    &policy);
                if (policy.zrp_request & ZPOOL_DO_REWIND)
@@ -2928,6 +2957,11 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
                mutex_exit(&spa_namespace_lock);
        }
 
+#ifdef _KERNEL
+       if (firstopen)
+               zvol_create_minors(spa->spa_name);
+#endif
+
        *spapp = spa;
 
        return (0);
@@ -3985,6 +4019,10 @@ spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
        mutex_exit(&spa_namespace_lock);
        spa_history_log_version(spa, LOG_POOL_IMPORT);
 
+#ifdef _KERNEL
+       zvol_create_minors(pool);
+#endif
+
        return (0);
 }
 
@@ -5137,7 +5175,7 @@ spa_vdev_remove_evacuate(spa_t *spa, vdev_t *vd)
         * The evacuation succeeded.  Remove any remaining MOS metadata
         * associated with this vdev, and wait for these changes to sync.
         */
-       ASSERT3U(vd->vdev_stat.vs_alloc, ==, 0);
+       ASSERT0(vd->vdev_stat.vs_alloc);
        txg = spa_vdev_config_enter(spa);
        vd->vdev_removing = B_TRUE;
        vdev_dirty(vd, 0, NULL, txg);
@@ -6138,7 +6176,7 @@ spa_sync(spa_t *spa, uint64_t txg)
                zio_t *zio = zio_root(spa, NULL, NULL, 0);
                VERIFY3U(bpobj_iterate(defer_bpo,
                    spa_free_sync_cb, zio, tx), ==, 0);
-               VERIFY3U(zio_wait(zio), ==, 0);
+               VERIFY0(zio_wait(zio));
        }
 
        /*