From 52a83dc6940ebeaca91f53494bb9be6f9b6bbc52 Mon Sep 17 00:00:00 2001 From: Tom Caputi Date: Fri, 5 Jul 2019 19:53:14 -0400 Subject: Remove VERIFY from dsl_dataset_crypt_stats() This patch fixes an issue where dsl_dataset_crypt_stats() would VERIFY that it was able to hold the encryption root. This function should instead silently continue without populating the related field in the nvlist, as is the convention for this code. Reviewed-by: Brian Behlendorf Signed-off-by: Tom Caputi Closes #8976 --- module/zfs/dsl_crypt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'module/zfs/dsl_crypt.c') diff --git a/module/zfs/dsl_crypt.c b/module/zfs/dsl_crypt.c index 568fe7aa3..24711227b 100644 --- a/module/zfs/dsl_crypt.c +++ b/module/zfs/dsl_crypt.c @@ -2624,11 +2624,13 @@ dsl_dataset_crypt_stats(dsl_dataset_t *ds, nvlist_t *nv) } if (dsl_dir_get_encryption_root_ddobj(dd, &intval) == 0) { - VERIFY0(dsl_dir_hold_obj(dd->dd_pool, intval, NULL, FTAG, - &enc_root)); - dsl_dir_name(enc_root, buf); - dsl_dir_rele(enc_root, FTAG); - dsl_prop_nvlist_add_string(nv, ZFS_PROP_ENCRYPTION_ROOT, buf); + if (dsl_dir_hold_obj(dd->dd_pool, intval, NULL, FTAG, + &enc_root) == 0) { + dsl_dir_name(enc_root, buf); + dsl_dir_rele(enc_root, FTAG); + dsl_prop_nvlist_add_string(nv, + ZFS_PROP_ENCRYPTION_ROOT, buf); + } } } -- cgit v1.2.3