summaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
authorTim Chase <[email protected]>2013-09-20 09:30:04 -0500
committerBrian Behlendorf <[email protected]>2013-09-25 15:44:22 -0700
commit8769db396691978a48abee1d1855709d7b01d4d0 (patch)
tree355dcd9708f5841a045bc1c23d81a84bb875c1c8 /module/zfs
parentc5322236eccc7c5e1d23983c78928ad566685e7c (diff)
Allocate the ioctl "output" nvlist with KM_PUSHPAGE.
Some ZFS errors such as certain snapshot failures can occur in the sync task context. Because they may require additional memory allocations, the initial nvlist must be allocated with KM_PUSHPAGE. Signed-off-by: Brian Behlendorf <[email protected]> Issue #1746 Issue #1737
Diffstat (limited to 'module/zfs')
-rw-r--r--module/zfs/zfs_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index acc54e5a7..be782ba80 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -5660,7 +5660,7 @@ zfsdev_ioctl(struct file *filp, unsigned cmd, unsigned long arg)
}
}
- outnvl = fnvlist_alloc();
+ VERIFY0(nvlist_alloc(&outnvl, NV_UNIQUE_NAME, KM_PUSHPAGE));
error = vec->zvec_func(zc->zc_name, innvl, outnvl);
if (error == 0 && vec->zvec_allow_log &&