Author: avg
Date: Wed Oct 9 11:57:45 2019
New Revision: 353343
URL: https://svnweb.freebsd.org/changeset/base/353343
Log:
zfs: remove gratuitous divergence from other openzfs flavours
The divergence is a result of a local change in r344601 and a followup
fix in r352580 that reverted portions of the earlier change.
MFC after: 1 week
Modified:
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Wed Oct
9 11:46:36 2019 (r353342)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Wed Oct
9 11:57:45 2019 (r353343)
@@ -1206,7 +1206,6 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
boolean_t isfromsnap, istosnap, fromorigin;
boolean_t exclude = B_FALSE;
FILE *fout = sdd->std_out ? stdout : stderr;
- uint64_t size = 0;
err = 0;
thissnap = strchr(zhp->zfs_name, '@') + 1;
@@ -1282,6 +1281,7 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
(sdd->fromorigin || sdd->replicate);
if (sdd->verbose || sdd->progress) {
+ uint64_t size = 0;
char fromds[ZFS_MAX_DATASET_NAME_LEN];
if (sdd->prevsnap[0] != '\0') {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
