svn commit: r352932 - releng/12.1/cddl/contrib/opensolaris/lib/libzfs/common

[Sean Eric Fagan]

Author: sef
Date: Tue Oct  1 18:05:51 2019
New Revision: 352932
URL: https://svnweb.freebsd.org/changeset/base/352932

Log:
  Fix a regression introduced in r344601, and work properly with the
  -v and -n options.
  
  PR:		240640
  Reported by:	Andriy Gapon <avg at FreeBSD.org>
  Reviewed by:	avg
  Differential Revision:	https://reviews.freebsd.org/D21709
  Approved by:	re

Modified:
  releng/12.1/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c

Modified: releng/12.1/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- releng/12.1/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Tue Oct  1 17:05:21 2019	(r352931)
+++ releng/12.1/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Tue Oct  1 18:05:51 2019	(r352932)
@@ -1289,13 +1289,11 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
 	fromorigin = sdd->prevsnap[0] == '\0' &&
 	    (sdd->fromorigin || sdd->replicate);
 
-	if (sdd->progress && sdd->dryrun) {
+	if (sdd->verbose || sdd->progress) {
 		(void) estimate_ioctl(zhp, sdd->prevsnap_obj,
 		    fromorigin, flags, &size);
 		sdd->size += size;
-	}
 
-	if (sdd->verbose) {
 		send_print_verbose(fout, zhp->zfs_name,
 		    sdd->prevsnap[0] ? sdd->prevsnap : NULL,
 		    size, sdd->parsable);
@@ -1663,7 +1661,7 @@ zfs_send_resume(libzfs_handle_t *hdl, sendflags_t *fla
 		fromname = name;
 	}
 
-	if (flags->progress) {
+	if (flags->progress || flags->verbose) {
 		error = lzc_send_space(zhp->zfs_name, fromname,
 		    lzc_flags, &size);
 		if (error == 0)
@@ -1933,7 +1931,7 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, cons
 		sdd.cleanup_fd = -1;
 		sdd.snapholds = NULL;
 	}
-	if (flags->progress || sdd.snapholds != NULL) {
+	if (flags->progress || flags->verbose || sdd.snapholds != NULL) {
 		/*
 		 * Do a verbose no-op dry run to get all the verbose output
 		 * or to gather snapshot hold's before generating any data,