diff options
| author | delphij <delphij@FreeBSD.org> | 2013-08-07 19:53:41 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-08-07 19:53:41 +0000 |
| commit | 7eeb668920093c143f04ad07ffdc84b1ccd9200d (patch) | |
| tree | d0077a1216b38564c5a1fcdb43833df9be0d6a91 | |
| parent | 47e159b0a49d0eaac681b29e62c262014098e054 (diff) | |
| download | FreeBSD-src-7eeb668920093c143f04ad07ffdc84b1ccd9200d.zip FreeBSD-src-7eeb668920093c143f04ad07ffdc84b1ccd9200d.tar.gz | |
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
| -rw-r--r-- | uts/common/fs/zfs/dmu_tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/uts/common/fs/zfs/dmu_tx.c b/uts/common/fs/zfs/dmu_tx.c index 929b0c4..8d23aa3 100644 --- a/uts/common/fs/zfs/dmu_tx.c +++ b/uts/common/fs/zfs/dmu_tx.c @@ -448,12 +448,12 @@ dmu_tx_count_free(dmu_tx_hold_t *txh, uint64_t off, uint64_t len) 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 */ |
