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
This commit is contained in:
parent
3f4e3bccdc
commit
f8e8686410
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=353343
@ -1206,7 +1206,6 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
|
|||||||
boolean_t isfromsnap, istosnap, fromorigin;
|
boolean_t isfromsnap, istosnap, fromorigin;
|
||||||
boolean_t exclude = B_FALSE;
|
boolean_t exclude = B_FALSE;
|
||||||
FILE *fout = sdd->std_out ? stdout : stderr;
|
FILE *fout = sdd->std_out ? stdout : stderr;
|
||||||
uint64_t size = 0;
|
|
||||||
|
|
||||||
err = 0;
|
err = 0;
|
||||||
thissnap = strchr(zhp->zfs_name, '@') + 1;
|
thissnap = strchr(zhp->zfs_name, '@') + 1;
|
||||||
@ -1282,6 +1281,7 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
|
|||||||
(sdd->fromorigin || sdd->replicate);
|
(sdd->fromorigin || sdd->replicate);
|
||||||
|
|
||||||
if (sdd->verbose || sdd->progress) {
|
if (sdd->verbose || sdd->progress) {
|
||||||
|
uint64_t size = 0;
|
||||||
char fromds[ZFS_MAX_DATASET_NAME_LEN];
|
char fromds[ZFS_MAX_DATASET_NAME_LEN];
|
||||||
|
|
||||||
if (sdd->prevsnap[0] != '\0') {
|
if (sdd->prevsnap[0] != '\0') {
|
||||||
|
Loading…
Reference in New Issue
Block a user