Page MenuHomeFreeBSD
Files F136921201

D21709.id.diff
No OneTemporary
Actions

D21709.id.diff
View Options

Index: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
===================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
@@ -1289,13 +1289,11 @@
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 @@
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 @@
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,

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 21, 4:23 PM (17 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25776117
Default Alt Text
D21709.id.diff (1 KB)

Event Timeline