diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-03-21 13:24:56 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-03-21 13:24:56 -0500 |
| commit | 696467e74a4bcf47c2bd3444dd7c1aeedbae50bf (patch) | |
| tree | 924de18265dc0be51357e1a33f5a92e945044299 /cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c | |
| parent | 07def894aa89bea6d85dd76d201343a4a2e73046 (diff) | |
| parent | ceb7b147e676803c22cf6d815f543f21fd9aa926 (diff) | |
| download | FreeBSD-src-696467e74a4bcf47c2bd3444dd7c1aeedbae50bf.zip FreeBSD-src-696467e74a4bcf47c2bd3444dd7c1aeedbae50bf.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c | 6 |
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); |
