patch tsoome-feedback

*** 350,360 ****
  
                  nvlist_free(props);
          }
  
  done:
-         if (bt.nbe_zfs_props != NULL)
                  nvlist_free(bt.nbe_zfs_props);
  
          be_zfs_fini();
  
          return (ret);
--- 350,359 ----
*** 1165,1175 ****
  
  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);
  
--- 1164,1173 ----
*** 2088,2098 ****
                          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
--- 2086,2095 ----
*** 2114,2124 ****
                                      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,
--- 2111,2120 ----
*** 2138,2148 ****
                                              "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;
                                  }
  
                                  /*
--- 2134,2143 ----
*** 2159,2169 ****
                                          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;
                                  }
                          }
                          /*
--- 2154,2163 ----
*** 2175,2191 ****
                                  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,
--- 2169,2183 ----