summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/libzfs_dataset.c
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2017-11-20 13:22:10 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2017-11-20 13:22:10 +0000
commit2d0998ba9095083be74c87c6dd61bd2d364b00ac (patch)
treebdfb4934708ce94c50d52f93f8ea6a3144e898c6 /usr/src/lib/libzfs/common/libzfs_dataset.c
parent3de4744b1b965ad188cb7a92a2461427367e9a12 (diff)
parenta375f4369f2774fb4628ce225260143f7e530cec (diff)
downloadillumos-joyent-2d0998ba9095083be74c87c6dd61bd2d364b00ac.tar.gz
[illumos-gate merge]
commit a375f4369f2774fb4628ce225260143f7e530cec 8788 tavor: variable 'cfi_dw_info' set but not used commit 8b8be354eac32fe0c94a52f66250bff1b4e646a1 8787 hermon: variable 'cfi_dw_info' set but not used commit a3b2868063897ff0083dea538f55f9873eec981f 8677 Open-Context Channel Programs commit 9dca21df58d57c2dadfa3bcb1d33c7bd0260cfd8 8807 More recent glib updates break hald build
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_dataset.c')
-rw-r--r--usr/src/lib/libzfs/common/libzfs_dataset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c
index 2c32553839..8a8469bc44 100644
--- a/usr/src/lib/libzfs/common/libzfs_dataset.c
+++ b/usr/src/lib/libzfs/common/libzfs_dataset.c
@@ -2357,7 +2357,7 @@ zcp_check(zfs_handle_t *zhp, zfs_prop_t prop, uint64_t intval,
fnvlist_add_string(argnvl, "dataset", zhp->zfs_name);
fnvlist_add_string(argnvl, "property", zfs_prop_to_name(prop));
- error = lzc_channel_program(poolname, program,
+ error = lzc_channel_program_nosync(poolname, program,
10 * 1000 * 1000, 10 * 1024 * 1024, argnvl, &outnvl);
if (error == 0) {