25c25
< * Copyright (c) 2011 by Delphix. All rights reserved.
---
> * Copyright (c) 2012 by Delphix. All rights reserved.
303a304
> case ZPOOL_PROP_EXPANDSZ:
393,394c394,395
< static boolean_t
< pool_is_bootable(zpool_handle_t *zhp)
---
> boolean_t
> zpool_is_bootable(zpool_handle_t *zhp)
1129c1130
< if (pool_is_bootable(zhp) && nvlist_lookup_nvlist_array(nvroot,
---
> if (zpool_is_bootable(zhp) && nvlist_lookup_nvlist_array(nvroot,
2415c2416
< boolean_t rootpool = pool_is_bootable(zhp);
---
> boolean_t rootpool = zpool_is_bootable(zhp);
3056a3058,3077
> * Reopen the pool.
> */
> int
> zpool_reopen(zpool_handle_t *zhp)
> {
> zfs_cmd_t zc = { 0 };
> char msg[1024];
> libzfs_handle_t *hdl = zhp->zpool_hdl;
>
> (void) snprintf(msg, sizeof (msg),
> dgettext(TEXT_DOMAIN, "cannot reopen '%s'"),
> zhp->zpool_name);
>
> (void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
> if (zfs_ioctl(hdl, ZFS_IOC_POOL_REOPEN, &zc) == 0)
> return (0);
> return (zpool_standard_error(hdl, errno, msg));
> }
>
> /*
3706c3727
< if (pool_is_bootable(zhp)) {
---
> if (zpool_is_bootable(zhp)) {