diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2013-12-01 19:53:18 -0500 |
|---|---|---|
| committer | Christopher Siden <chris.siden@delphix.com> | 2013-12-01 19:53:19 -0500 |
| commit | bb411a08b05466bfe0c7095b6373bbc1587e259a (patch) | |
| tree | 41a4f125a89f9af70e2392c29442134e99a26686 | |
| parent | dee140df5444b21d7034d3c528e68f193f96244c (diff) | |
| download | illumos-joyent-bb411a08b05466bfe0c7095b6373bbc1587e259a.tar.gz | |
4188 assertion failed in dmu_tx_hold_free(): dn_datablkshift != 0
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dmu_tx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/dmu_tx.c b/usr/src/uts/common/fs/zfs/dmu_tx.c index 44350f7b3b..70c91aca8d 100644 --- a/usr/src/uts/common/fs/zfs/dmu_tx.c +++ b/usr/src/uts/common/fs/zfs/dmu_tx.c @@ -635,9 +635,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++) { |