Date: Wed, 7 Aug 2013 19:53:42 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r254071 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/ztest Message-ID: <201308071953.r77JrgtX068333@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Wed Aug 7 19:53:41 2013 New Revision: 254071 URL: http://svnweb.freebsd.org/changeset/base/254071 Log: Update vendor/illumos/dist and vendor-sys/illumos/dist to illumos-gate 14121:6f5ac5d649af: Illumos ZFS issues: 3955 ztest failure: assertion refcount_count(&tx->tx_space_written) + delta <= tx->tx_space_towrite Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Changes in other areas also in this revision: Modified: vendor/illumos/dist/cmd/ztest/ztest.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 Aug 7 19:51:54 2013 (r254070) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c Wed Aug 7 19:53:41 2013 (r254071) @@ -448,12 +448,12 @@ dmu_tx_count_free(dmu_tx_hold_t *txh, ui blkid = off >> dn->dn_datablkshift; nblks = (len + dn->dn_datablksz - 1) >> dn->dn_datablkshift; - if (blkid >= dn->dn_maxblkid) { + if (blkid > dn->dn_maxblkid) { rw_exit(&dn->dn_struct_rwlock); return; } if (blkid + nblks > dn->dn_maxblkid) - nblks = dn->dn_maxblkid - blkid; + nblks = dn->dn_maxblkid - blkid + 1; } l0span = nblks; /* save for later use to calc level > 1 overhead */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308071953.r77JrgtX068333>