Skip to content

Commit

Permalink
3909 "zfs send -D" does not work
Browse files Browse the repository at this point in the history
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Christopher Siden <christopher.siden@delphix.com>
  • Loading branch information
Steven Hartland authored and Christopher Siden committed Jul 29, 2013
1 parent 2f3d878 commit 36f7455
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions usr/src/lib/libzfs/common/libzfs_sendrecv.c
Expand Up @@ -1566,8 +1566,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) {
Expand Down Expand Up @@ -1603,8 +1603,8 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
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);
}
Expand Down

0 comments on commit 36f7455

Please sign in to comment.