Some nvlist allocations in hold processing need to use KM_PUSHPAGE.

Commit 95fd54a1c5b93bb2aa3e7dffc28c784b1e21a8bb restructured the
hold/release processing and moved some of the work into the sync task.
A number of nvlist allocations now need to use KM_PUSHPAGE.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1852
Closes #1855

diff --git a/module/zfs/dsl_userhold.c b/module/zfs/dsl_userhold.c
index 6f047047707775c90857706e5e5deffe139d54c0..1fca66afb990e4a96efc1486b22a0a759927d919 100644 (file)
--- a/module/zfs/dsl_userhold.c
+++ b/module/zfs/dsl_userhold.c
@@ -166,7 +166,8 @@ dsl_dataset_user_hold_sync_one_impl(nvlist_t *tmpholds, dsl_dataset_t *ds,
                    (u_longlong_t)ds->ds_object);
 
                if (nvlist_lookup_nvlist(tmpholds, name, &tags) != 0) {
-                       tags = fnvlist_alloc();
+                       VERIFY0(nvlist_alloc(&tags, NV_UNIQUE_NAME,
+                           KM_PUSHPAGE));
                        fnvlist_add_boolean(tags, htag);
                        fnvlist_add_nvlist(tmpholds, name, tags);
                        fnvlist_free(tags);
@@ -242,7 +243,7 @@ dsl_dataset_user_hold_sync_one(dsl_dataset_t *ds, const char *htag,
        nvlist_t *tmpholds;
 
        if (minor != 0)
-               tmpholds = fnvlist_alloc();
+               VERIFY0(nvlist_alloc(&tmpholds, NV_UNIQUE_NAME, KM_PUSHPAGE));
        else
                tmpholds = NULL;
        dsl_dataset_user_hold_sync_one_impl(tmpholds, ds, htag, minor, now, tx);
@@ -363,7 +364,7 @@ dsl_dataset_user_release_check_one(dsl_dataset_user_release_arg_t *ddura,
        numholds = 0;
        mos = ds->ds_dir->dd_pool->dp_meta_objset;
        zapobj = ds->ds_phys->ds_userrefs_obj;
-       holds_found = fnvlist_alloc();
+       VERIFY0(nvlist_alloc(&holds_found, NV_UNIQUE_NAME, KM_PUSHPAGE));
 
        for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
            pair = nvlist_next_nvpair(holds, pair)) {
@@ -600,8 +601,10 @@ dsl_dataset_user_release_impl(nvlist_t *holds, nvlist_t *errlist,
 
        ddura.ddura_holds = holds;
        ddura.ddura_errlist = errlist;
-       ddura.ddura_todelete = fnvlist_alloc();
-       ddura.ddura_chkholds = fnvlist_alloc();
+       VERIFY0(nvlist_alloc(&ddura.ddura_todelete, NV_UNIQUE_NAME,
+           KM_PUSHPAGE));
+       VERIFY0(nvlist_alloc(&ddura.ddura_chkholds, NV_UNIQUE_NAME,
+           KM_PUSHPAGE));
 
        error = dsl_sync_task(pool, dsl_dataset_user_release_check,
            dsl_dataset_user_release_sync, &ddura,