| dmu_send.c (249196) | dmu_send.c (249356) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 1678 unchanged lines hidden (view full) --- 1687 guid_map_entry_t *gmep; 1688 int err; 1689 1690 ASSERT(guid_map != NULL); 1691 1692 err = dsl_pool_hold(name, FTAG, &dp); 1693 if (err != 0) 1694 return (err); | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 1678 unchanged lines hidden (view full) --- 1687 guid_map_entry_t *gmep; 1688 int err; 1689 1690 ASSERT(guid_map != NULL); 1691 1692 err = dsl_pool_hold(name, FTAG, &dp); 1693 if (err != 0) 1694 return (err); |
| 1695 gmep = kmem_alloc(sizeof (guid_map_entry_t), KM_SLEEP); | 1695 gmep = kmem_alloc(sizeof (*gmep), KM_SLEEP); |
| 1696 err = dsl_dataset_hold_obj(dp, snapobj, gmep, &snapds); 1697 if (err == 0) { 1698 gmep->guid = snapds->ds_phys->ds_guid; 1699 gmep->gme_ds = snapds; 1700 avl_add(guid_map, gmep); 1701 dsl_dataset_long_hold(snapds, gmep); 1702 } else | 1696 err = dsl_dataset_hold_obj(dp, snapobj, gmep, &snapds); 1697 if (err == 0) { 1698 gmep->guid = snapds->ds_phys->ds_guid; 1699 gmep->gme_ds = snapds; 1700 avl_add(guid_map, gmep); 1701 dsl_dataset_long_hold(snapds, gmep); 1702 } else |
| 1703 kmem_free(gmep, sizeof (guid_map_entry_t)); | 1703 kmem_free(gmep, sizeof (*gmep)); |
| 1704 1705 dsl_pool_rele(dp, FTAG); 1706 return (err); 1707} 1708 1709static int dmu_recv_end_modified_blocks = 3; 1710 1711static int --- 50 unchanged lines hidden --- | 1704 1705 dsl_pool_rele(dp, FTAG); 1706 return (err); 1707} 1708 1709static int dmu_recv_end_modified_blocks = 3; 1710 1711static int --- 50 unchanged lines hidden --- |