svn commit: r249356 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Martin Matuska]

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