| dmu_diff.c (275811) | dmu_diff.c (286705) |
|---|---|
| 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 --- 124 unchanged lines hidden (view full) --- 133 const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg) 134{ 135 struct diffarg *da = arg; 136 int err = 0; 137 138 if (issig(JUSTLOOKING) && issig(FORREAL)) 139 return (SET_ERROR(EINTR)); 140 | 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 --- 124 unchanged lines hidden (view full) --- 133 const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg) 134{ 135 struct diffarg *da = arg; 136 int err = 0; 137 138 if (issig(JUSTLOOKING) && issig(FORREAL)) 139 return (SET_ERROR(EINTR)); 140 |
| 141 if (zb->zb_object != DMU_META_DNODE_OBJECT) | 141 if (bp == NULL || zb->zb_object != DMU_META_DNODE_OBJECT) |
| 142 return (0); 143 144 if (BP_IS_HOLE(bp)) { 145 uint64_t span = DBP_SPAN(dnp, zb->zb_level); 146 uint64_t dnobj = (zb->zb_blkid * span) >> DNODE_SHIFT; 147 148 err = report_free_dnode_range(da, dnobj, 149 dnobj + (span >> DNODE_SHIFT) - 1); --- 102 unchanged lines hidden --- | 142 return (0); 143 144 if (BP_IS_HOLE(bp)) { 145 uint64_t span = DBP_SPAN(dnp, zb->zb_level); 146 uint64_t dnobj = (zb->zb_blkid * span) >> DNODE_SHIFT; 147 148 err = report_free_dnode_range(da, dnobj, 149 dnobj + (span >> DNODE_SHIFT) - 1); --- 102 unchanged lines hidden --- |