diff options
| author | delphij <delphij@FreeBSD.org> | 2014-03-19 23:55:03 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-03-19 23:55:03 +0000 |
| commit | ede49d4106ad9e6d34a2592322e48604f72605bd (patch) | |
| tree | 0012bcb04d95eaf4e65ed2f983e9d51d47236888 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c | |
| parent | 8e41bb96f82aa123d5f4c625c68f95b253640b28 (diff) | |
| download | FreeBSD-src-ede49d4106ad9e6d34a2592322e48604f72605bd.zip FreeBSD-src-ede49d4106ad9e6d34a2592322e48604f72605bd.tar.gz | |
MFC r260150: MFV r259170:
4370 avoid transmitting holes during zfs send
4371 DMU code clean up
illumos/illumos-gate@43466aae47bfcd2ad9bf501faec8e75c08095e4f
NOTE: Make sure the boot code is updated if a zpool upgrade is
done on boot zpool.
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c index 2154fdf..64c97c9 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c @@ -282,7 +282,8 @@ zvol_map_block(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, zvol_extent_t *ze; int bs = ma->ma_zv->zv_volblocksize; - if (bp == NULL || zb->zb_object != ZVOL_OBJ || zb->zb_level != 0) + if (BP_IS_HOLE(bp) || + zb->zb_object != ZVOL_OBJ || zb->zb_level != 0) return (0); VERIFY3U(ma->ma_blks, ==, zb->zb_blkid); |
