From a60ca23dc52059ace3f92bb9a63e723ac49e649b Mon Sep 17 00:00:00 2001 From: Tom Caputi Date: Fri, 28 Jun 2019 13:00:25 +0000 Subject: 11276 Allow unencrypted children of encrypted datasets Portions contributed by: Jerry Jelinek Reviewed by: Jason King Reviewed by: Sean Eric Fagan Reviewed by: Richard Laager Reviewed by: Matthew Ahrens Reviewed by: Brian Behlendorf Reviewed by: Kody Kantor Reviewed by: C Fraire Approved by: Dan McDonald --- usr/src/lib/libzfs/common/libzfs_dataset.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'usr/src/lib/libzfs/common/libzfs_dataset.c') diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index 117e414a9a..628125e38b 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -4494,16 +4494,9 @@ zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive, "with the new name")); (void) zfs_error(hdl, EZFS_EXISTS, errbuf); } else if (errno == EACCES) { - if (zfs_prop_get_int(zhp, ZFS_PROP_ENCRYPTION) == - ZIO_CRYPT_OFF) { - zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "cannot rename an unencrypted dataset to " - "be a decendent of an encrypted one")); - } else { - zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "cannot move encryption child outside of " - "its encryption root")); - } + zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, + "cannot move encrypted child outside of " + "its encryption root")); (void) zfs_error(hdl, EZFS_CRYPTOFAILED, errbuf); } else { (void) zfs_standard_error(zhp->zfs_hdl, errno, errbuf); -- cgit v1.2.3