libzfs: sendrecv: always cancel progress thread in zfs_send_one()

This is in line with all the other uses of the progress thread Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#11560 Closes openzfs#13284
nabijaczleweli · Apr 11, 2022 · 1f4c79b · 1f4c79b
1 parent 35ddd8e
commit 1f4c79b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
@@ -2522,8 +2522,7 @@ zfs_send_one(zfs_handle_t *zhp, const char *from, int fd, sendflags_t *flags,
 
 	if (flags->progress) {
 		void *status = NULL;
-		if (err != 0)
-			(void) pthread_cancel(ptid);
+		(void) pthread_cancel(ptid);
 		(void) pthread_join(ptid, &status);
 		int error = (int)(uintptr_t)status;
 		if (error != 0 && status != PTHREAD_CANCELED)