summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Hartland <[email protected]>2013-07-29 11:36:31 -0800
committerBrian Behlendorf <[email protected]>2013-11-05 12:15:11 -0800
commit6389d42205f56083b7658b2c67f117a244f13e52 (patch)
treea7ccadcdb50ff0e72f403b9a77bb9e1bdb98fdd9
parentea97f8ce35a8a515610e52b7e4744549f9c510f4 (diff)
Illumos #3909
3909 "zfs send -D" does not work Reviewed by: Matthew Ahrens <[email protected]> Approved by: Christopher Siden <[email protected]> References: https://www.illumos.org/issues/3909 illumos/illumos-gate@36f7455d36b60be70d7aae5959fa19e71954678e Ported-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #1775
-rw-r--r--lib/libzfs/libzfs_sendrecv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
index 6f0d27f5b..9f366eea1 100644
--- a/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@ -1572,8 +1572,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) {
@@ -1609,8 +1609,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);
}