Use KM_PUSHPAGE instead of KM_SLEEP

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

diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c
index 700cc96..7185540 100644 (file)
--- a/module/zfs/dsl_pool.c
+++ b/module/zfs/dsl_pool.c
@@ -92,7 +92,7 @@ dsl_pool_open_impl(spa_t *spa, uint64_t txg)
 
        mutex_init(&dp->dp_lock, NULL, MUTEX_DEFAULT, NULL);
 
-       dp->dp_vnrele_taskq = taskq_create("zfs_vn_rele_taskq", 1, minclsyspri,
+       dp->dp_iput_taskq = taskq_create("zfs_iput_taskq", 1, minclsyspri,
            1, 4, 0);
 
        return (dp);
@@ -214,7 +214,7 @@ dsl_pool_close(dsl_pool_t *dp)
        dsl_scan_fini(dp);
        rw_destroy(&dp->dp_config_rwlock);
        mutex_destroy(&dp->dp_lock);
-       taskq_destroy(dp->dp_vnrele_taskq);
+       taskq_destroy(dp->dp_iput_taskq);
        if (dp->dp_blkstats)
                kmem_free(dp->dp_blkstats, sizeof (zfs_all_blkstats_t));
        kmem_free(dp, sizeof (dsl_pool_t));
@@ -322,7 +322,7 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
        start = gethrtime();
 
        zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
-       while (ds = txg_list_remove(&dp->dp_dirty_datasets, txg)) {
+       while ((ds = txg_list_remove(&dp->dp_dirty_datasets, txg))) {
                /*
                 * We must not sync any non-MOS datasets twice, because
                 * we may have taken a snapshot of them.  However, we
@@ -350,7 +350,7 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
         * whose ds_bp will be rewritten when we do this 2nd sync.
         */
        zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
-       while (ds = txg_list_remove(&dp->dp_dirty_datasets, txg)) {
+       while ((ds = txg_list_remove(&dp->dp_dirty_datasets, txg))) {
                ASSERT(list_link_active(&ds->ds_synced_link));
                dmu_buf_rele(ds->ds_dbuf, ds);
                dsl_dataset_sync(ds, zio, tx);
@@ -367,7 +367,7 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
                    deadlist_enqueue_cb, &ds->ds_deadlist, tx);
        }
 
-       while (dstg = txg_list_remove(&dp->dp_sync_tasks, txg)) {
+       while ((dstg = txg_list_remove(&dp->dp_sync_tasks, txg))) {
                /*
                 * No more sync tasks should have been added while we
                 * were syncing.
@@ -378,7 +378,7 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
        DTRACE_PROBE(pool_sync__3task);
 
        start = gethrtime();
-       while (dd = txg_list_remove(&dp->dp_dirty_dirs, txg))
+       while ((dd = txg_list_remove(&dp->dp_dirty_dirs, txg)))
                dsl_dir_sync(dd, tx);
        write_time += gethrtime() - start;
 
@@ -448,7 +448,7 @@ dsl_pool_sync_done(dsl_pool_t *dp, uint64_t txg)
        dsl_dataset_t *ds;
        objset_t *os;
 
-       while (ds = list_head(&dp->dp_synced_datasets)) {
+       while ((ds = list_head(&dp->dp_synced_datasets))) {
                list_remove(&dp->dp_synced_datasets, ds);
                os = ds->ds_objset;
                zil_clean(os->os_zil, txg);
@@ -692,9 +692,10 @@ upgrade_dir_clones_cb(spa_t *spa, uint64_t dsobj, const char *dsname, void *arg)
 void
 dsl_pool_upgrade_dir_clones(dsl_pool_t *dp, dmu_tx_t *tx)
 {
-       ASSERT(dmu_tx_is_syncing(tx));
        uint64_t obj;
 
+       ASSERT(dmu_tx_is_syncing(tx));
+
        (void) dsl_dir_create_sync(dp, dp->dp_root_dir, FREE_DIR_NAME, tx);
        VERIFY(0 == dsl_pool_open_special_dir(dp,
            FREE_DIR_NAME, &dp->dp_free_dir));
@@ -737,9 +738,9 @@ dsl_pool_create_origin(dsl_pool_t *dp, dmu_tx_t *tx)
 }
 
 taskq_t *
-dsl_pool_vnrele_taskq(dsl_pool_t *dp)
+dsl_pool_iput_taskq(dsl_pool_t *dp)
 {
-       return (dp->dp_vnrele_taskq);
+       return (dp->dp_iput_taskq);
 }
 
 /*