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

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 <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #11560
Closes #13284
This commit is contained in:
наб 2022-04-04 14:25:01 +02:00 committed by Brian Behlendorf
parent 3c69b539fe
commit 1217fd1ff8
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

@ -2643,8 +2643,7 @@ zfs_send_one_cb_impl(zfs_handle_t *zhp, const char *from, int fd,
if (flags->progress) { if (flags->progress) {
void *status = NULL; void *status = NULL;
if (err != 0) (void) pthread_cancel(ptid);
(void) pthread_cancel(ptid);
(void) pthread_join(ptid, &status); (void) pthread_join(ptid, &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)