Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MFC r253818:

Fix zfs send -D hang after processing requiring a CTRL+C to interrupt due to
pthread_join prior to fd close.

Approved by:	re (delphij)
  • Loading branch information...
commit 5dd84e79975697b1896686b3a1e3dcf800d0b6b8 1 parent 9f9ac8a
smh authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
View
4 cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
@@ -1576,8 +1576,8 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
if (tid != 0) {
if (err != 0)
(void) pthread_cancel(tid);
- (void) pthread_join(tid, NULL);
(void) close(pipefd[0]);
+ (void) pthread_join(tid, NULL);
}
if (sdd.cleanup_fd != -1) {
@@ -1613,8 +1613,8 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
VERIFY(0 == close(sdd.cleanup_fd));
if (tid != 0) {
(void) pthread_cancel(tid);
- (void) pthread_join(tid, NULL);
(void) close(pipefd[0]);
+ (void) pthread_join(tid, NULL);
}
return (err);
}
Please sign in to comment.
Something went wrong with that request. Please try again.