Author: mav
Date: Mon Mar 21 00:23:51 2016
New Revision: 297117
URL: https://svnweb.freebsd.org/changeset/base/297117
Log:
MFC r296533: MFV r296532: 6637 replacing "dontclose" with "should_close"
Reviewed by: Matthew Ahrens <mahr...@delphix.com>
Reviewed by: Prakash Surya <prakash.su...@delphix.com>
Approved by: Robert Mustacchi <r...@joyent.com>
Author: David Schwartz <dschwartz...@gmail.com>
illumos/illumos-gate@d189620258b3c9b0e2f7e2104840be2eee7c68e5
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Mon Mar 21
00:22:55 2016 (r297116)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Mon Mar 21
00:23:51 2016 (r297117)
@@ -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 *da
}
}
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 *da
cb->cb_depth--;
}
- if (!dontclose)
+ if (should_close)
zfs_close(zhp);
return (0);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
