From owner-svn-src-vendor@FreeBSD.ORG Tue Jun 25 21:44:49 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D241B8F; Tue, 25 Jun 2013 21:44:49 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AA38718EE; Tue, 25 Jun 2013 21:44:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5PLinqA064543; Tue, 25 Jun 2013 21:44:49 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5PLin28064540; Tue, 25 Jun 2013 21:44:49 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201306252144.r5PLin28064540@svn.freebsd.org> From: Xin LI Date: Tue, 25 Jun 2013 21:44:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r252215 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/lib/libzfs/common vendor/illumos/dist/lib/libzfs_core/common X-SVN-Group: vendor-sys 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: Tue, 25 Jun 2013 21:44:49 -0000 Author: delphij Date: Tue Jun 25 21:44:48 2013 New Revision: 252215 URL: http://svnweb.freebsd.org/changeset/base/252215 Log: Update vendor/illumos/dist and vendor-sys/illumos/dist to illumos-gate 14060:aeb4e8fef072 Illumos ZFS issues: 3829 fix for 3740 changed behavior of zfs destroy/hold/release ioctl Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c Changes in other areas also in this revision: Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c vendor/illumos/dist/lib/libzfs_core/common/libzfs_core.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c Tue Jun 25 21:43:49 2013 (r252214) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_destroy.c Tue Jun 25 21:44:48 2013 (r252215) @@ -129,9 +129,6 @@ dsl_destroy_snapshot_check(void *arg, dm if (pair != NULL) return (fnvpair_value_int32(pair)); - if (nvlist_empty(dsda->dsda_successful_snaps)) - return (SET_ERROR(ENOENT)); - return (0); } Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c Tue Jun 25 21:43:49 2013 (r252214) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_userhold.c Tue Jun 25 21:44:48 2013 (r252215) @@ -126,10 +126,6 @@ dsl_dataset_user_hold_check(void *arg, d } } - /* Return ENOENT if no holds would be created. */ - if (nvlist_empty(dduha->dduha_chkholds)) - return (SET_ERROR(ENOENT)); - return (0); } @@ -468,10 +464,6 @@ dsl_dataset_user_release_check(void *arg } } - /* Return ENOENT if none of the holds existed. */ - if (nvlist_empty(ddura->ddura_chkholds)) - return (SET_ERROR(ENOENT)); - return (0); }