svn commit: r253903 - stable/8/cddl/contrib/opensolaris/lib/libzfs/common
Steven Hartland
smh at FreeBSD.org
Fri Aug 2 23:33:41 UTC 2013
Author: smh
Date: Fri Aug 2 23:33:40 2013
New Revision: 253903
URL: http://svnweb.freebsd.org/changeset/base/253903
Log:
MFC r253818:
Fix zfs send -D hang after processing requiring a CTRL+C to interrupt due to
pthread_join prior to fd close.
Modified:
stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Directory Properties:
stable/8/cddl/contrib/opensolaris/ (props changed)
stable/8/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Fri Aug 2 23:31:51 2013 (r253902)
+++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Fri Aug 2 23:33:40 2013 (r253903)
@@ -1576,8 +1576,8 @@ zfs_send(zfs_handle_t *zhp, const char *
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);
}
More information about the svn-src-stable-8
mailing list