Attachment 207644 Details for Bug 240640 – Proposed patch

Proposed patch

zfs-send-diffs-short.txt (text/plain), 1.44 KB, created by Sean Eric Fagan on 2019-09-20 07:25:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Eric Fagan

Created: 2019-09-20 07:25:30 UTC

Size: 1.44 KB

patch

obsolete

>diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
>index cf5aedafca7..290b8926d3a 100644
>--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
>+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
>@@ -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 *flags, int outfd,
> 		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, const char *tosnap,
> 		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,

Flags:

sef: maintainer-approval? (re)

Actions: View

Attachments on bug 240640: 207644