diff options
author | smh <smh@FreeBSD.org> | 2013-07-30 20:45:27 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2013-07-30 20:45:27 +0000 |
commit | ef92cf9910e5912fe431aaad8b444da2aaae9741 (patch) | |
tree | f52179596b77a45580d001f8053bb1f66d5e8252 /cddl/contrib | |
parent | 744a60053606bf8c3f5c880db82f3e2e7d9484b8 (diff) | |
download | FreeBSD-src-ef92cf9910e5912fe431aaad8b444da2aaae9741.zip FreeBSD-src-ef92cf9910e5912fe431aaad8b444da2aaae9741.tar.gz |
MFV r253784:
Fix zfs send -D hang after processing requiring a CTRL+C to interrupt due to
pthread_join prior to fd close.
This was introduced by r251646 (MFV r251644)
Illumos ZFS issue:
3909 "zfs send -D" does not work
MFC after: 1 day
Diffstat (limited to 'cddl/contrib')
-rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c index d0eac12..1fc46c2 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c +++ b/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 @@ err_out: 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); } |