| dmu_send.c (208047) | dmu_send.c (209962) |
|---|---|
| 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 --- 166 unchanged lines hidden (view full) --- 175{ 176 struct backuparg *ba = arg; 177 dmu_object_type_t type = bp ? BP_GET_TYPE(bp) : DMU_OT_NONE; 178 int err = 0; 179 180 if (issig(JUSTLOOKING) && issig(FORREAL)) 181 return (EINTR); 182 | 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 --- 166 unchanged lines hidden (view full) --- 175{ 176 struct backuparg *ba = arg; 177 dmu_object_type_t type = bp ? BP_GET_TYPE(bp) : DMU_OT_NONE; 178 int err = 0; 179 180 if (issig(JUSTLOOKING) && issig(FORREAL)) 181 return (EINTR); 182 |
| 183 if (bp == NULL && zb->zb_object == 0) { | 183 if (zb->zb_object != 0 && DMU_OBJECT_IS_SPECIAL(zb->zb_object)) { 184 return (0); 185 } else if (bp == NULL && zb->zb_object == 0) { |
| 184 uint64_t span = BP_SPAN(dnp, zb->zb_level); 185 uint64_t dnobj = (zb->zb_blkid * span) >> DNODE_SHIFT; 186 err = dump_freeobjects(ba, dnobj, span >> DNODE_SHIFT); 187 } else if (bp == NULL) { 188 uint64_t span = BP_SPAN(dnp, zb->zb_level); 189 err = dump_free(ba, zb->zb_object, zb->zb_blkid * span, span); 190 } else if (zb->zb_level > 0 || type == DMU_OT_OBJSET) { 191 return (0); --- 1030 unchanged lines hidden --- | 186 uint64_t span = BP_SPAN(dnp, zb->zb_level); 187 uint64_t dnobj = (zb->zb_blkid * span) >> DNODE_SHIFT; 188 err = dump_freeobjects(ba, dnobj, span >> DNODE_SHIFT); 189 } else if (bp == NULL) { 190 uint64_t span = BP_SPAN(dnp, zb->zb_level); 191 err = dump_free(ba, zb->zb_object, zb->zb_blkid * span, span); 192 } else if (zb->zb_level > 0 || type == DMU_OT_OBJSET) { 193 return (0); --- 1030 unchanged lines hidden --- |