diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-10 12:33:44 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-10 12:33:44 +0000 |
| commit | 61fc27627bcb706d365a0bbc48e0f0b5088f160f (patch) | |
| tree | fccc20dadf1c6ad5ded3656c71f8d6bc959a1728 /usr/src/cmd | |
| parent | b3fd9b18977148b2e9e64a11e4667e7511c03dde (diff) | |
| parent | d189620258b3c9b0e2f7e2104840be2eee7c68e5 (diff) | |
| download | illumos-joyent-61fc27627bcb706d365a0bbc48e0f0b5088f160f.tar.gz | |
[illumos-gate merge]
commit d189620258b3c9b0e2f7e2104840be2eee7c68e5
6637 replacing "dontclose" with "should_close"
commit 5f7a8e6d750cb070a3347f045201c6206caee6aa
6562 Refquota on receive doesn't account for overage
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_iter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/cmd/zfs/zfs_iter.c b/usr/src/cmd/zfs/zfs_iter.c index 645524061c..3581a4715e 100644 --- a/usr/src/cmd/zfs/zfs_iter.c +++ b/usr/src/cmd/zfs/zfs_iter.c @@ -91,7 +91,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); @@ -119,7 +119,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); } @@ -143,7 +143,7 @@ zfs_callback(zfs_handle_t *zhp, void *data) cb->cb_depth--; } - if (!dontclose) + if (should_close) zfs_close(zhp); return (0); |