1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-21 11:13:30 +00:00

Update vendor/illumos/dist to illumos-gate 14096:12d3631da129:

Illumos ZFS issues:
  3909 "zfs send -D" does not work
This commit is contained in:
Xin LI 2013-07-29 20:36:27 +00:00
parent e11712b9c5
commit fe8484c3ba
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/vendor/illumos/dist/; revision=253784

View File

@ -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 @@ 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);
}