From owner-svn-src-all@FreeBSD.ORG Thu Apr 11 07:40:31 2013 Return-Path: Delivered-To: svn-src-all@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 CC55EDA5; Thu, 11 Apr 2013 07:40:31 +0000 (UTC) (envelope-from mm@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 BF3D77A3; Thu, 11 Apr 2013 07:40:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3B7eVrm068798; Thu, 11 Apr 2013 07:40:31 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3B7eV13068797; Thu, 11 Apr 2013 07:40:31 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201304110740.r3B7eV13068797@svn.freebsd.org> From: Martin Matuska Date: Thu, 11 Apr 2013 07:40:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249356 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2013 07:40:31 -0000 Author: mm Date: Thu Apr 11 07:40:30 2013 New Revision: 249356 URL: http://svnweb.freebsd.org/changeset/base/249356 Log: MFV r249354: Merge bugfixes accepted and integrated by vendor. Underlying problems have been reported by us and fixed in r240942 and r249196. Illumos ZFS issues: 3645 dmu_send_impl: possibilty of pool hold leak 3692 Panic on zfs receive of a recursive deduplicated stream MFC after: 8 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Directory Properties: head/sys/cddl/contrib/opensolaris/ (props changed) Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Thu Apr 11 07:30:49 2013 (r249355) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c Thu Apr 11 07:40:30 2013 (r249356) @@ -1692,7 +1692,7 @@ add_ds_to_guidmap(const char *name, avl_ err = dsl_pool_hold(name, FTAG, &dp); if (err != 0) return (err); - gmep = kmem_alloc(sizeof (guid_map_entry_t), KM_SLEEP); + gmep = kmem_alloc(sizeof (*gmep), KM_SLEEP); err = dsl_dataset_hold_obj(dp, snapobj, gmep, &snapds); if (err == 0) { gmep->guid = snapds->ds_phys->ds_guid; @@ -1700,7 +1700,7 @@ add_ds_to_guidmap(const char *name, avl_ avl_add(guid_map, gmep); dsl_dataset_long_hold(snapds, gmep); } else - kmem_free(gmep, sizeof (guid_map_entry_t)); + kmem_free(gmep, sizeof (*gmep)); dsl_pool_rele(dp, FTAG); return (err);