svn commit: r253784 - vendor/illumos/dist/lib/libzfs/common

[Xin LI]

Author: delphij
Date: Mon Jul 29 20:36:27 2013
New Revision: 253784
URL: http://svnweb.freebsd.org/changeset/base/253784

Log:
  Update vendor/illumos/dist to illumos-gate 14096:12d3631da129:
  
  Illumos ZFS issues:
    3909 "zfs send -D" does not work

Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c	Mon Jul 29 20:35:12 2013	(r253783)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c	Mon Jul 29 20:36:27 2013	(r253784)
@@ -1566,8 +1566,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) {
@@ -1603,8 +1603,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);
 }