Deleted Added
full compact
dmu_send.c (268123) dmu_send.c (268473)
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

--- 1182 unchanged lines hidden (view full) ---

1191 drrb->drr_fromguid = BSWAP_64(drrb->drr_fromguid);
1192 }
1193
1194 drba.drba_origin = origin;
1195 drba.drba_cookie = drc;
1196 drba.drba_cred = CRED();
1197
1198 return (dsl_sync_task(tofs, dmu_recv_begin_check, dmu_recv_begin_sync,
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

--- 1182 unchanged lines hidden (view full) ---

1191 drrb->drr_fromguid = BSWAP_64(drrb->drr_fromguid);
1192 }
1193
1194 drba.drba_origin = origin;
1195 drba.drba_cookie = drc;
1196 drba.drba_cred = CRED();
1197
1198 return (dsl_sync_task(tofs, dmu_recv_begin_check, dmu_recv_begin_sync,
1199 &drba, 5));
1199 &drba, 5, ZFS_SPACE_CHECK_NORMAL));
1200}
1201
1202struct restorearg {
1203 int err;
1204 boolean_t byteswap;
1205 kthread_t *td;
1206 struct file *fp;
1207 char *buf;

--- 868 unchanged lines hidden (view full) ---

2076 * necessary.
2077 */
2078 dsl_dataset_name(drc->drc_ds, name);
2079 zfs_destroy_unmount_origin(name);
2080#endif
2081
2082 error = dsl_sync_task(drc->drc_tofs,
2083 dmu_recv_end_check, dmu_recv_end_sync, drc,
1200}
1201
1202struct restorearg {
1203 int err;
1204 boolean_t byteswap;
1205 kthread_t *td;
1206 struct file *fp;
1207 char *buf;

--- 868 unchanged lines hidden (view full) ---

2076 * necessary.
2077 */
2078 dsl_dataset_name(drc->drc_ds, name);
2079 zfs_destroy_unmount_origin(name);
2080#endif
2081
2082 error = dsl_sync_task(drc->drc_tofs,
2083 dmu_recv_end_check, dmu_recv_end_sync, drc,
2084 dmu_recv_end_modified_blocks);
2084 dmu_recv_end_modified_blocks, ZFS_SPACE_CHECK_NORMAL);
2085
2086 if (error != 0)
2087 dmu_recv_cleanup_ds(drc);
2088 return (error);
2089}
2090
2091static int
2092dmu_recv_new_end(dmu_recv_cookie_t *drc)
2093{
2094 int error;
2095
2096 error = dsl_sync_task(drc->drc_tofs,
2097 dmu_recv_end_check, dmu_recv_end_sync, drc,
2085
2086 if (error != 0)
2087 dmu_recv_cleanup_ds(drc);
2088 return (error);
2089}
2090
2091static int
2092dmu_recv_new_end(dmu_recv_cookie_t *drc)
2093{
2094 int error;
2095
2096 error = dsl_sync_task(drc->drc_tofs,
2097 dmu_recv_end_check, dmu_recv_end_sync, drc,
2098 dmu_recv_end_modified_blocks);
2098 dmu_recv_end_modified_blocks, ZFS_SPACE_CHECK_NORMAL);
2099
2100 if (error != 0) {
2101 dmu_recv_cleanup_ds(drc);
2102 } else if (drc->drc_guid_to_ds_map != NULL) {
2103 (void) add_ds_to_guidmap(drc->drc_tofs,
2104 drc->drc_guid_to_ds_map,
2105 drc->drc_newsnapobj);
2106 }

--- 23 unchanged lines hidden ---
2099
2100 if (error != 0) {
2101 dmu_recv_cleanup_ds(drc);
2102 } else if (drc->drc_guid_to_ds_map != NULL) {
2103 (void) add_ds_to_guidmap(drc->drc_tofs,
2104 drc->drc_guid_to_ds_map,
2105 drc->drc_newsnapobj);
2106 }

--- 23 unchanged lines hidden ---