diff options
| author | delphij <delphij@FreeBSD.org> | 2013-06-12 07:07:06 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-06-12 07:07:06 +0000 |
| commit | ab3dbcb998b288fc8190c5c1f56d91720e535286 (patch) | |
| tree | 82a807ab86be2fa57fe72fbd606665c2c02dd664 /cddl/contrib/opensolaris/cmd/zhack | |
| parent | cba1418efedac7ba586dbc2591b16cb3cb7e9c66 (diff) | |
| download | FreeBSD-src-ab3dbcb998b288fc8190c5c1f56d91720e535286.zip FreeBSD-src-ab3dbcb998b288fc8190c5c1f56d91720e535286.tar.gz | |
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
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zhack')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zhack/zhack.c | 3 |
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 d80b3a0..1eb8713 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 || |
