Date: Wed, 4 Dec 2013 14:50:44 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r258923 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201312041450.rB4Eoi7c057812@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Wed Dec 4 14:50:43 2013 New Revision: 258923 URL: http://svnweb.freebsd.org/changeset/base/258923 Log: 4188 assertion failed in dmu_tx_hold_free(): dn_datablkshift != 0 illumos/illumos-gate@bb411a08b05466bfe0c7095b6373bbc1587e259a Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Wed Dec 4 14:49:20 2013 (r258922) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Wed Dec 4 14:50:43 2013 (r258923) @@ -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++) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312041450.rB4Eoi7c057812>