diff options
| author | pjd <pjd@FreeBSD.org> | 2013-12-18 21:45:46 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2013-12-18 21:45:46 +0000 |
| commit | f052ba0c916b09694516ca67a3475b5b6aa7eab9 (patch) | |
| tree | 1b7549efd0b25e952cd241ba8ecccb46f8a3355c /sys/cddl | |
| parent | a84f53bdd79e281979412e50c640af14ed0ad918 (diff) | |
| download | FreeBSD-src-f052ba0c916b09694516ca67a3475b5b6aa7eab9.zip FreeBSD-src-f052ba0c916b09694516ca67a3475b5b6aa7eab9.tar.gz | |
MFV r258923: 4188 assertion failed in dmu_tx_hold_free(): dn_datablkshift != 0
illumos/illumos-gate@bb411a08b05466bfe0c7095b6373bbc1587e259a
MFC after: 3 days
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c index c784d12..1213d91 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c @@ -636,9 +636,16 @@ dmu_tx_hold_free(dmu_tx_t *tx, uint64_t object, uint64_t off, uint64_t len) uint64_t start = off >> shift; uint64_t end = (off + len) >> shift; - ASSERT(dn->dn_datablkshift != 0); ASSERT(dn->dn_indblkshift != 0); + /* + * dnode_reallocate() can result in an object with indirect + * blocks having an odd data block size. In this case, + * just check the single block. + */ + if (dn->dn_datablkshift == 0) + start = end = 0; + zio = zio_root(tx->tx_pool->dp_spa, NULL, NULL, ZIO_FLAG_CANFAIL); for (uint64_t i = start; i <= end; i++) { |
