Fix zpool on zvol deadlock

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

diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index 4e04324..628b23b 100644 (file)
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -262,7 +262,7 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
 
        ASSERT(ds == NULL || MUTEX_HELD(&ds->ds_opening_lock));
 
-       os = kmem_zalloc(sizeof (objset_t), KM_SLEEP);
+       os = kmem_zalloc(sizeof (objset_t), KM_PUSHPAGE);
        os->os_dsl_dataset = ds;
        os->os_spa = spa;
        os->os_rootbp = bp;
@@ -848,7 +848,7 @@ snapshot_check(void *arg1, void *arg2, dmu_tx_t *tx)
                if (strlen(sn->htag) + MAX_TAG_PREFIX_LEN >= MAXNAMELEN)
                        return (E2BIG);
 
-               sn->ha = kmem_alloc(sizeof (struct dsl_ds_holdarg), KM_SLEEP);
+               sn->ha = kmem_alloc(sizeof(struct dsl_ds_holdarg), KM_PUSHPAGE);
                sn->ha->temphold = B_TRUE;
                sn->ha->htag = sn->htag;
        }
@@ -1182,17 +1182,6 @@ dmu_objset_is_dirty(objset_t *os, uint64_t txg)
            !list_is_empty(&os->os_free_dnodes[txg & TXG_MASK]));
 }
 
-boolean_t
-dmu_objset_is_dirty_anywhere(objset_t *os)
-{
-       int t;
-
-       for (t = 0; t < TXG_SIZE; t++)
-               if (dmu_objset_is_dirty(os, t))
-                       return (B_TRUE);
-       return (B_FALSE);
-}
-
 static objset_used_cb_t *used_cbs[DMU_OST_NUMTYPES];
 
 void