aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2019-10-09 11:57:45 +0000
committerAndriy Gapon <avg@FreeBSD.org>2019-10-09 11:57:45 +0000
commitf8e86864109442cc945ae23b98752f88eb12a625 (patch)
tree6c2ae9ab4e9d688a1644b8178ee656998b7a903a /cddl/contrib
parent3f4e3bccdcedf22c935dda575c1de1f20452f03d (diff)
downloadsrc-f8e86864109442cc945ae23b98752f88eb12a625.tar.gz
src-f8e86864109442cc945ae23b98752f88eb12a625.zip
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
Notes
Notes: svn path=/head/; revision=353343
Diffstat (limited to 'cddl/contrib')
-rw-r--r--cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
index c1e07fa33106..4360f96a0b9f 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
@@ -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') {