| zvol.c (259813) | zvol.c (260150) |
|---|---|
| 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 --- 268 unchanged lines hidden (view full) --- 277static int 278zvol_map_block(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, 279 const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) 280{ 281 struct maparg *ma = arg; 282 zvol_extent_t *ze; 283 int bs = ma->ma_zv->zv_volblocksize; 284 | 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 --- 268 unchanged lines hidden (view full) --- 277static int 278zvol_map_block(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, 279 const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) 280{ 281 struct maparg *ma = arg; 282 zvol_extent_t *ze; 283 int bs = ma->ma_zv->zv_volblocksize; 284 |
| 285 if (bp == NULL || zb->zb_object != ZVOL_OBJ || zb->zb_level != 0) | 285 if (BP_IS_HOLE(bp) || 286 zb->zb_object != ZVOL_OBJ || zb->zb_level != 0) |
| 286 return (0); 287 288 VERIFY3U(ma->ma_blks, ==, zb->zb_blkid); 289 ma->ma_blks++; 290 291 /* Abort immediately if we have encountered gang blocks */ 292 if (BP_IS_GANG(bp)) 293 return (SET_ERROR(EFRAGS)); --- 2217 unchanged lines hidden --- | 287 return (0); 288 289 VERIFY3U(ma->ma_blks, ==, zb->zb_blkid); 290 ma->ma_blks++; 291 292 /* Abort immediately if we have encountered gang blocks */ 293 if (BP_IS_GANG(bp)) 294 return (SET_ERROR(EFRAGS)); --- 2217 unchanged lines hidden --- |