summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2016-03-08 18:32:31 +0000
committermav <mav@FreeBSD.org>2016-03-08 18:32:31 +0000
commitf200ff4e7593123220aabb2b19a5cd5adfd56529 (patch)
treed0e3d04ff08581670a11a9392fde56fdb2437fe6
parent6126cff85dfba5b780bf4375556534db410c3529 (diff)
downloadFreeBSD-src-f200ff4e7593123220aabb2b19a5cd5adfd56529.zip
FreeBSD-src-f200ff4e7593123220aabb2b19a5cd5adfd56529.tar.gz
MFV r296532: 6637 replacing "dontclose" with "should_close"
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Robert Mustacchi <rm@joyent.com> Author: David Schwartz <dschwartz783@gmail.com> illumos/illumos-gate@d189620258b3c9b0e2f7e2104840be2eee7c68e5
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
index 626d69c..317063e 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
@@ -93,7 +93,7 @@ static int
zfs_callback(zfs_handle_t *zhp, void *data)
{
callback_data_t *cb = data;
- boolean_t dontclose = B_FALSE;
+ boolean_t should_close = B_TRUE;
boolean_t include_snaps = zfs_include_snapshots(zhp, cb);
boolean_t include_bmarks = (cb->cb_types & ZFS_TYPE_BOOKMARK);
@@ -121,7 +121,7 @@ zfs_callback(zfs_handle_t *zhp, void *data)
}
}
uu_avl_insert(cb->cb_avl, node, idx);
- dontclose = B_TRUE;
+ should_close = B_FALSE;
} else {
free(node);
}
@@ -147,7 +147,7 @@ zfs_callback(zfs_handle_t *zhp, void *data)
cb->cb_depth--;
}
- if (!dontclose)
+ if (should_close)
zfs_close(zhp);
return (0);
OpenPOWER on IntegriCloud