Mercurial > illumos > illumos-gate

changeset 14096:12d3631da129

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3909 "zfs send -D" does not work Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Christopher Siden <christopher.siden@delphix.com>
author Steven Hartland <smh@freebsd.org>
date Mon, 29 Jul 2013 11:36:31 -0800
parents 277fa158020c
children 9a220e49d686
files usr/src/lib/libzfs/common/libzfs_sendrecv.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c	Mon Jul 29 10:58:53 2013 -0800
+++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c	Mon Jul 29 11:36:31 2013 -0800
@@ -1566,8 +1566,8 @@
 	if (tid != 0) {
 		if (err != 0)
 			(void) pthread_cancel(tid);
+		(void) close(pipefd[0]);
 		(void) pthread_join(tid, NULL);
-		(void) close(pipefd[0]);
 	}
 
 	if (sdd.cleanup_fd != -1) {
@@ -1603,8 +1603,8 @@
 		VERIFY(0 == close(sdd.cleanup_fd));
 	if (tid != 0) {
 		(void) pthread_cancel(tid);
+		(void) close(pipefd[0]);
 		(void) pthread_join(tid, NULL);
-		(void) close(pipefd[0]);
 	}
 	return (err);
 }