Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

libzfs_sendrecv: Style pass on dump_snapshot 

* Add a high level comment.
* Avoid unnecessary line wrapping.
* Simplify size accounting logic.
* Eliminate unnecessary buffer on the stack.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes #12967
This commit is contained in:
Ryan Moeller 2021-08-18 17:04:46 +00:00 committed by Brian Behlendorf
parent 447e90e360
commit 1ae7835177
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libzfs/libzfs_sendrecv.c
View File

@ -995,6 +995,10 @@ send_print_verbose(FILE *fout, const char *tosnap, const char *fromsnap,
(void) fprintf(fout, "\n"); (void) fprintf(fout, "\n");
} }
/*
* Send a single filesystem snapshot, updating the send dump data.
* This interface is intended for use as a zfs_iter_snapshots_sorted visitor.
*/
static int static int
dump_snapshot(zfs_handle_t *zhp, void *arg) dump_snapshot(zfs_handle_t *zhp, void *arg)
{ {
@ -1016,8 +1020,7 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
if (!sdd->seenfrom && isfromsnap) { if (!sdd->seenfrom && isfromsnap) {
gather_holds(zhp, sdd); gather_holds(zhp, sdd);
sdd->seenfrom = B_TRUE; sdd->seenfrom = B_TRUE;
(void) strlcpy(sdd->prevsnap, thissnap, (void) strlcpy(sdd->prevsnap, thissnap, sizeof (sdd->prevsnap));
sizeof (sdd->prevsnap));
sdd->prevsnap_obj = zfs_prop_get_int(zhp, ZFS_PROP_OBJSETID); sdd->prevsnap_obj = zfs_prop_get_int(zhp, ZFS_PROP_OBJSETID);
zfs_close(zhp); zfs_close(zhp);
return (0); return (0);
@ -1097,14 +1100,12 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
(void) strlcat(fromds, sdd->prevsnap, sizeof (fromds)); (void) strlcat(fromds, sdd->prevsnap, sizeof (fromds));
} }
if (zfs_send_space(zhp, zhp->zfs_name, if (zfs_send_space(zhp, zhp->zfs_name,
sdd->prevsnap[0] ? fromds : NULL, flags, &size) != 0) { sdd->prevsnap[0] ? fromds : NULL, flags, &size) == 0) {
size = 0; /* cannot estimate send space */
} else {
send_print_verbose(fout, zhp->zfs_name, send_print_verbose(fout, zhp->zfs_name,
sdd->prevsnap[0] ? sdd->prevsnap : NULL, sdd->prevsnap[0] ? sdd->prevsnap : NULL,
size, sdd->parsable); size, sdd->parsable);
sdd->size += size;
} }
sdd->size += size;
} }
if (!sdd->dryrun) { if (!sdd->dryrun) {
@ -1135,12 +1136,9 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
(void) pthread_join(tid, &status); (void) pthread_join(tid, &status);
int error = (int)(uintptr_t)status; int error = (int)(uintptr_t)status;
if (error != 0 && status != PTHREAD_CANCELED) { if (error != 0 && status != PTHREAD_CANCELED) {
char errbuf[1024];
(void) snprintf(errbuf, sizeof (errbuf),
dgettext(TEXT_DOMAIN,
"progress thread exited nonzero"));
return (zfs_standard_error(zhp->zfs_hdl, error, return (zfs_standard_error(zhp->zfs_hdl, error,
errbuf)); dgettext(TEXT_DOMAIN,
"progress thread exited nonzero")));
} }
} }
} }