summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/libzfs_dataset.c
diff options
context:
space:
mode:
authorloli10K <ezomori.nozomu@gmail.com>2019-07-23 15:22:07 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-07-31 11:57:16 +0000
commit6ccda740e007c01cb5d1436fe337851ff8c5d422 (patch)
tree89e68035d49559e0004280b98187af6a0885a1d5 /usr/src/lib/libzfs/common/libzfs_dataset.c
parentfed692705a66b80d86971df5b579fcac7386f7df (diff)
downloadillumos-gate-6ccda740e007c01cb5d1436fe337851ff8c5d422.tar.gz
11282 port ZoL send/recv fixes
Portions contributed by: Jerry Jelinek <jerry.jelinek@joyent.com> Portions contributed by: Brian Behlendorf <behlendorf1@llnl.gov> Portions contributed by: Paul Zuchowski <pzuchowski@datto.com> Portions contributed by: Tom Caputi <tcaputi@datto.com> Portions contributed by: Roman Strashkin <roman.strashkin@nexenta.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Olaf Faaland <faaland1@llnl.gov> Reviewed by: Tom Caputi <tcaputi@datto.com> Reviewed by: Alek Pinchuk <apinchuk@datto.com> Reviewed by: loli10K <ezomori.nozomu@gmail.com> Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed by: Paul Dagnelie <pcd@delphix.com> Reviewed by: Jorgen Lundman <lundman@lundman.net> Reviewed by: Richard Elling <Richard.Elling@RichardElling.com> Reviewed by: Giuseppe Di Natale <dinatale2@llnl.gov> Reviewed by: George Melikov <mail@gmelikov.ru> Reviewed by: Kody Kantor <kody.kantor@joyent.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_dataset.c')
-rw-r--r--usr/src/lib/libzfs/common/libzfs_dataset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c
index a0f401de45..5b424d730b 100644
--- a/usr/src/lib/libzfs/common/libzfs_dataset.c
+++ b/usr/src/lib/libzfs/common/libzfs_dataset.c
@@ -3676,8 +3676,8 @@ zfs_create(libzfs_handle_t *hdl, const char *path, zfs_type_t type,
}
(void) parent_name(path, parent, sizeof (parent));
- if (zfs_crypto_create(hdl, parent, props, NULL, &wkeydata,
- &wkeylen) != 0) {
+ if (zfs_crypto_create(hdl, parent, props, NULL, B_TRUE,
+ &wkeydata, &wkeylen) != 0) {
nvlist_free(props);
return (zfs_error(hdl, EZFS_CRYPTOFAILED, errbuf));
}