aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/cmd/zhack/zhack.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2013-06-12 07:07:06 +0000
committerXin LI <delphij@FreeBSD.org>2013-06-12 07:07:06 +0000
commit962532154793aa019b5669efaacd0b9e25bcfb52 (patch)
tree82a807ab86be2fa57fe72fbd606665c2c02dd664 /cddl/contrib/opensolaris/cmd/zhack/zhack.c
parent9ae49f268a2f403165a9214dfae3670069d379c0 (diff)
parent03ce21f2d0e122652d805c27c18579ad28c62208 (diff)
downloadsrc-962532154793aa019b5669efaacd0b9e25bcfb52.tar.gz
src-962532154793aa019b5669efaacd0b9e25bcfb52.zip
MFV r251644:
Poor ZFS send / receive performance due to snapshot hold / release processing (by smh@) Illumos ZFS issues: 3740 Poor ZFS send / receive performance due to snapshot hold / release processing MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=251646
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zhack/zhack.c')
-rw-r--r--cddl/contrib/opensolaris/cmd/zhack/zhack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zhack/zhack.c b/cddl/contrib/opensolaris/cmd/zhack/zhack.c
index d80b3a013d3e..1eb87136f2db 100644
--- a/cddl/contrib/opensolaris/cmd/zhack/zhack.c
+++ b/cddl/contrib/opensolaris/cmd/zhack/zhack.c
@@ -21,6 +21,7 @@
/*
* Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland. All rights reserved.
*/
/*
@@ -153,7 +154,7 @@ import_pool(const char *target, boolean_t readonly)
g_importargs.poolname = g_pool;
pools = zpool_search_import(g_zfs, &g_importargs);
- if (pools == NULL || nvlist_next_nvpair(pools, NULL) == NULL) {
+ if (nvlist_empty(pools)) {
if (!g_importargs.can_be_active) {
g_importargs.can_be_active = B_TRUE;
if (zpool_search_import(g_zfs, &g_importargs) != NULL ||