| libzfs_sendrecv.c (251646) | libzfs_sendrecv.c (253818) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 1562 unchanged lines hidden (view full) --- 1571 1572 /* Ensure no snaps found is treated as an error. */ 1573 if (err == 0 && !sdd.seento) 1574 err = ENOENT; 1575 1576 if (tid != 0) { 1577 if (err != 0) 1578 (void) pthread_cancel(tid); | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 1562 unchanged lines hidden (view full) --- 1571 1572 /* Ensure no snaps found is treated as an error. */ 1573 if (err == 0 && !sdd.seento) 1574 err = ENOENT; 1575 1576 if (tid != 0) { 1577 if (err != 0) 1578 (void) pthread_cancel(tid); |
| 1579 (void) pthread_join(tid, NULL); | |
| 1580 (void) close(pipefd[0]); | 1579 (void) close(pipefd[0]); |
| 1580 (void) pthread_join(tid, NULL); |
|
| 1581 } 1582 1583 if (sdd.cleanup_fd != -1) { 1584 VERIFY(0 == close(sdd.cleanup_fd)); 1585 sdd.cleanup_fd = -1; 1586 } 1587 1588 if (!flags->dryrun && (flags->replicate || flags->doall || --- 19 unchanged lines hidden (view full) --- 1608 fsavl_destroy(fsavl); 1609 nvlist_free(fss); 1610 fnvlist_free(sdd.snapholds); 1611 1612 if (sdd.cleanup_fd != -1) 1613 VERIFY(0 == close(sdd.cleanup_fd)); 1614 if (tid != 0) { 1615 (void) pthread_cancel(tid); | 1581 } 1582 1583 if (sdd.cleanup_fd != -1) { 1584 VERIFY(0 == close(sdd.cleanup_fd)); 1585 sdd.cleanup_fd = -1; 1586 } 1587 1588 if (!flags->dryrun && (flags->replicate || flags->doall || --- 19 unchanged lines hidden (view full) --- 1608 fsavl_destroy(fsavl); 1609 nvlist_free(fss); 1610 fnvlist_free(sdd.snapholds); 1611 1612 if (sdd.cleanup_fd != -1) 1613 VERIFY(0 == close(sdd.cleanup_fd)); 1614 if (tid != 0) { 1615 (void) pthread_cancel(tid); |
| 1616 (void) pthread_join(tid, NULL); | |
| 1617 (void) close(pipefd[0]); | 1616 (void) close(pipefd[0]); |
| 1617 (void) pthread_join(tid, NULL); |
|
| 1618 } 1619 return (err); 1620} 1621 1622/* 1623 * Routines specific to "zfs recv" 1624 */ 1625 --- 1616 unchanged lines hidden --- | 1618 } 1619 return (err); 1620} 1621 1622/* 1623 * Routines specific to "zfs recv" 1624 */ 1625 --- 1616 unchanged lines hidden --- |