diff options
| author | mm <mm@FreeBSD.org> | 2012-09-26 09:37:58 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-09-26 09:37:58 +0000 |
| commit | e0125673c3366f5bcd214cc0ce608d4a18cfd401 (patch) | |
| tree | f0e2a61c166065d1911f8b078891bd21c9d89d60 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c | |
| parent | c5b2970fc8a1ec3ef52e09770f11c01519e81a49 (diff) | |
| download | FreeBSD-src-e0125673c3366f5bcd214cc0ce608d4a18cfd401.zip FreeBSD-src-e0125673c3366f5bcd214cc0ce608d4a18cfd401.tar.gz | |
Merge recent vendor changes in ZFS.
Illumos issued covered:
2811 missing implementation: zfs send -r
3139 zdb dies when it tries to determine path of unlinked file
3189 kernel panic in ZFS test suite during hotspare_onoffline_004_neg
3208 moving zpool cross-endian results in incorrect user/group accounting
References:
https://www.illumos.org/issues/ + [issue_id]
Obtained from: illumos (vendor/illumos, vendor/illumos-sys)
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c index ec151c8..91336a0 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c @@ -572,7 +572,7 @@ dmu_tx_count_free(dmu_tx_hold_t *txh, uint64_t off, uint64_t len) (dn->dn_indblkshift - SPA_BLKPTRSHIFT); while (level++ < maxlevel) { - txh->txh_memory_tohold += MIN(blkcnt, (nl1blks >> epbs)) + txh->txh_memory_tohold += MAX(MIN(blkcnt, nl1blks), 1) << dn->dn_indblkshift; blkcnt = 1 + (blkcnt >> epbs); } |
