Print this page
patch tsoome-feedback
@@ -350,11 +350,10 @@
nvlist_free(props);
}
done:
- if (bt.nbe_zfs_props != NULL)
nvlist_free(bt.nbe_zfs_props);
be_zfs_fini();
return (ret);
@@ -1165,11 +1164,10 @@
done:
ZFS_CLOSE(zhp);
be_free_fs_list(&fld);
- if (bt.nbe_zfs_props != NULL)
nvlist_free(bt.nbe_zfs_props);
free(bt.obe_altroot);
free(new_mp);
@@ -2088,11 +2086,10 @@
if (iret != BE_ERR_BE_EXISTS) {
be_print_err(gettext("be_copy_zones: "
"failed to create zone BE clone for new "
"zone BE %s\n"), new_zone_be_name);
ret = iret;
- if (bt.nbe_zfs_props != NULL)
nvlist_free(bt.nbe_zfs_props);
goto done;
}
/*
* We failed to create the new zone BE because a zone
@@ -2114,11 +2111,10 @@
zone_be_name)) == NULL) {
be_print_err(gettext("be_copy_zones: "
"failed to generate auto name "
"for zone BE.\n"));
ret = BE_ERR_AUTONAME;
- if (bt.nbe_zfs_props != NULL)
nvlist_free(bt.nbe_zfs_props);
goto done;
}
(void) snprintf(new_zoneroot_ds,
@@ -2138,11 +2134,10 @@
"failed to open zone root "
"dataset (%s): %s\n"),
zoneroot_ds,
libzfs_error_description(g_zfs));
ret = zfs_err_to_be_err(g_zfs);
- if (bt.nbe_zfs_props != NULL)
nvlist_free(bt.nbe_zfs_props);
goto done;
}
/*
@@ -2159,11 +2154,10 @@
be_print_err(gettext("be_copy_zones: "
"failed to create zone BE clone "
"for new zone BE %s\n"),
new_zone_be_name);
ret = iret;
- if (bt.nbe_zfs_props != NULL)
nvlist_free(bt.nbe_zfs_props);
goto done;
}
}
/*
@@ -2175,17 +2169,15 @@
be_print_err(gettext("be_copy_zones: failed "
"to create a unique auto zone BE name\n"));
free(bt.nbe_name);
bt.nbe_name = NULL;
ret = BE_ERR_AUTONAME;
- if (bt.nbe_zfs_props != NULL)
nvlist_free(bt.nbe_zfs_props);
goto done;
}
}
- if (bt.nbe_zfs_props != NULL)
nvlist_free(bt.nbe_zfs_props);
z_zhp = NULL;
if ((z_zhp = zfs_open(g_zfs, new_zoneroot_ds,