diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2013-04-11 07:40:30 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2013-04-11 07:40:30 +0000 |
| commit | 2cb0c5e42411ad6df56967c763117c817b9679cd (patch) | |
| tree | ce7ce2f068278f8ec8669a1ed57748ec24f6d071 /sys/cddl | |
| parent | b448b67bbb8f8f3d1946803516cefd5850a02e86 (diff) | |
| parent | c5018d571dd5cfdd409ed1a103f4218fd26cd56c (diff) | |
| download | src-2cb0c5e42411ad6df56967c763117c817b9679cd.tar.gz src-2cb0c5e42411ad6df56967c763117c817b9679cd.zip | |
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
Notes
Notes:
svn path=/head/; revision=249356
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c index ac8221c8b1a9..5da0700de456 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c @@ -1692,7 +1692,7 @@ add_ds_to_guidmap(const char *name, avl_tree_t *guid_map, uint64_t snapobj) 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_tree_t *guid_map, uint64_t snapobj) 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); |