zpool import is braindead

*** 25,34 ****
--- 25,35 ----
   * Copyright (c) 2013 by Delphix. All rights reserved.
   * Copyright (c) 2012 DEY Storage Systems, Inc.  All rights reserved.
   * Copyright (c) 2013 Martin Matuska. All rights reserved.
   * Copyright (c) 2013 Steven Hartland. All rights reserved.
   * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+  * Copyright 2014 RackTop Systems.
   */
  
  #include <ctype.h>
  #include <errno.h>
  #include <libintl.h>
*** 1483,1493 ****
          char errbuf[1024];
          libzfs_handle_t *hdl = zhp->zfs_hdl;
          nvlist_t *nvl = NULL, *realprops;
          zfs_prop_t prop;
          boolean_t do_prefix = B_TRUE;
!         int added_resv;
  
          (void) snprintf(errbuf, sizeof (errbuf),
              dgettext(TEXT_DOMAIN, "cannot set property for '%s'"),
              zhp->zfs_name);
  
--- 1484,1494 ----
          char errbuf[1024];
          libzfs_handle_t *hdl = zhp->zfs_hdl;
          nvlist_t *nvl = NULL, *realprops;
          zfs_prop_t prop;
          boolean_t do_prefix = B_TRUE;
!         int added_resv = 0;
  
          (void) snprintf(errbuf, sizeof (errbuf),
              dgettext(TEXT_DOMAIN, "cannot set property for '%s'"),
              zhp->zfs_name);
  
*** 3003,3013 ****
  int
  zfs_create_ancestors(libzfs_handle_t *hdl, const char *path)
  {
          int prefix;
          char *path_copy;
!         int rc;
  
          if (check_parents(hdl, path, NULL, B_TRUE, &prefix) != 0)
                  return (-1);
  
          if ((path_copy = strdup(path)) != NULL) {
--- 3004,3014 ----
  int
  zfs_create_ancestors(libzfs_handle_t *hdl, const char *path)
  {
          int prefix;
          char *path_copy;
!         int rc = 0;
  
          if (check_parents(hdl, path, NULL, B_TRUE, &prefix) != 0)
                  return (-1);
  
          if ((path_copy = strdup(path)) != NULL) {
*** 3625,3635 ****
  zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, boolean_t force)
  {
          rollback_data_t cb = { 0 };
          int err;
          boolean_t restore_resv = 0;
!         uint64_t old_volsize, new_volsize;
          zfs_prop_t resv_prop;
  
          assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM ||
              zhp->zfs_type == ZFS_TYPE_VOLUME);
  
--- 3626,3636 ----
  zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, boolean_t force)
  {
          rollback_data_t cb = { 0 };
          int err;
          boolean_t restore_resv = 0;
!         uint64_t old_volsize = 0, new_volsize;
          zfs_prop_t resv_prop;
  
          assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM ||
              zhp->zfs_type == ZFS_TYPE_VOLUME);
  
*** 3697,3707 ****
   */
  int
  zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive,
      boolean_t force_unmount)
  {
!         int ret;
          zfs_cmd_t zc = { 0 };
          char *delim;
          prop_changelist_t *cl = NULL;
          zfs_handle_t *zhrp = NULL;
          char *parentname = NULL;
--- 3698,3708 ----
   */
  int
  zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive,
      boolean_t force_unmount)
  {
!         int ret = -1;
          zfs_cmd_t zc = { 0 };
          char *delim;
          prop_changelist_t *cl = NULL;
          zfs_handle_t *zhrp = NULL;
          char *parentname = NULL;