Author: pjd
Date: Sun Dec 22 19:36:08 2013
New Revision: 259734
URL: http://svnweb.freebsd.org/changeset/base/259734
Log:
MFC r259576:
MFV r258923: 4188 assertion failed in dmu_tx_hold_free(): dn_datablkshift != 0
illumos/illumos-gate@bb411a08b05466bfe0c7095b6373bbc1587e259a
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Dec
22 19:33:15 2013 (r259733)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Dec
22 19:36:08 2013 (r259734)
@@ -635,9 +635,16 @@ dmu_tx_hold_free(dmu_tx_t *tx, uint64_t
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++) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
