diff options
| author | Steven Hartland <smh@freebsd.org> | 2013-07-29 11:36:31 -0800 |
|---|---|---|
| committer | Christopher Siden <chris.siden@delphix.com> | 2013-07-29 12:36:31 -0700 |
| commit | 36f7455d36b60be70d7aae5959fa19e71954678e (patch) | |
| tree | 1eaee7c8f0a125a9cf30d89f417a69b86f6a2bfa /usr | |
| parent | 2f3d878000c3b33cde13e16c4f0a1ab15d883a18 (diff) | |
| download | illumos-joyent-36f7455d36b60be70d7aae5959fa19e71954678e.tar.gz | |
3909 "zfs send -D" does not work
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Christopher Siden <christopher.siden@delphix.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_sendrecv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c index cf6d32f7b0..fefaa0d513 100644 --- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c +++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c @@ -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) { @@ -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); } |