From owner-svn-src-vendor@FreeBSD.ORG Mon Jul 29 20:36:27 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B82DDE1B; Mon, 29 Jul 2013 20:36:27 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A4E842F41; Mon, 29 Jul 2013 20:36:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6TKaRui024964; Mon, 29 Jul 2013 20:36:27 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6TKaR2t024963; Mon, 29 Jul 2013 20:36:27 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201307292036.r6TKaR2t024963@svn.freebsd.org> From: Xin LI Date: Mon, 29 Jul 2013 20:36:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253784 - vendor/illumos/dist/lib/libzfs/common X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jul 2013 20:36:27 -0000 Author: delphij Date: Mon Jul 29 20:36:27 2013 New Revision: 253784 URL: http://svnweb.freebsd.org/changeset/base/253784 Log: Update vendor/illumos/dist to illumos-gate 14096:12d3631da129: Illumos ZFS issues: 3909 "zfs send -D" does not work Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c Mon Jul 29 20:35:12 2013 (r253783) +++ vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c Mon Jul 29 20:36:27 2013 (r253784) @@ -1566,8 +1566,8 @@ zfs_send(zfs_handle_t *zhp, const char * 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); }