From eaa10257ca72f75c2cd3e0662782b5897ba50093 Mon Sep 17 00:00:00 2001 From: Jorgen Lundman Date: Thu, 22 Jul 2021 11:22:27 +0900 Subject: [PATCH] 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 Reviewed-by: Tony Nguyen Signed-off-by: Jorgen Lundman Closes #12404 --- lib/libzfs/libzfs_sendrecv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index 5e7d06465d..4340ff9552 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -2403,7 +2403,6 @@ zfs_send_one(zfs_handle_t *zhp, const char *from, int fd, sendflags_t *flags, int err; libzfs_handle_t *hdl = zhp->zfs_hdl; char *name = zhp->zfs_name; - int orig_fd = fd; pthread_t ptid; progress_arg_t pa = { 0 }; @@ -2535,7 +2534,7 @@ zfs_send_one(zfs_handle_t *zhp, const char *from, int fd, sendflags_t *flags, if (flags->props || flags->holds || flags->backup) { /* Write the final end record. */ - err = send_conclusion_record(orig_fd, NULL); + err = send_conclusion_record(fd, NULL); if (err != 0) return (zfs_standard_error(hdl, err, errbuf)); }