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

Remove old orig_fd variable from zfs send 

Possibly required in the past, but is currently fills no purpose.
Ordinarily such tiny cleanup is not generally worth it, however
on the macOS port, in a future commit, we do unspeakable things to the
"fd" for send/recv, and it would be easier to only have to deal with
one "fd" instead of two.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com>
Signed-off-by: Jorgen Lundman <lundman@lundman.net>
Closes #12404
This commit is contained in:
Jorgen Lundman 2021-07-22 11:22:27 +09:00 committed by GitHub
parent 1b50749ce9
commit c14ad80fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libzfs/libzfs_sendrecv.c
View File

@ -2391,7 +2391,6 @@ zfs_send_one(zfs_handle_t *zhp, const char *from, int fd, sendflags_t *flags,
int err; int err;
libzfs_handle_t *hdl = zhp->zfs_hdl; libzfs_handle_t *hdl = zhp->zfs_hdl;
char *name = zhp->zfs_name; char *name = zhp->zfs_name;
int orig_fd = fd;
pthread_t ptid; pthread_t ptid;
progress_arg_t pa = { 0 }; progress_arg_t pa = { 0 };
@ -2523,7 +2522,7 @@ zfs_send_one(zfs_handle_t *zhp, const char *from, int fd, sendflags_t *flags,
if (flags->props || flags->holds || flags->backup) { if (flags->props || flags->holds || flags->backup) {
/* Write the final end record. */ /* Write the final end record. */
err = send_conclusion_record(orig_fd, NULL); err = send_conclusion_record(fd, NULL);
if (err != 0) if (err != 0)
return (zfs_standard_error(hdl, err, errbuf)); return (zfs_standard_error(hdl, err, errbuf));
} }