git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Linux 3.9 compat: Undefine GCC_VERSION
[zfs.git]
/
module
/
zfs
/
dmu_tx.c
diff --git
a/module/zfs/dmu_tx.c
b/module/zfs/dmu_tx.c
index
044349c
..
e47d858
100644
(file)
--- a/
module/zfs/dmu_tx.c
+++ b/
module/zfs/dmu_tx.c
@@
-589,7
+589,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 += M
IN(blkcnt, (nl1blks >> epbs)
)
+ txh->txh_memory_tohold += M
AX(MIN(blkcnt, nl1blks), 1
)
<< dn->dn_indblkshift;
blkcnt = 1 + (blkcnt >> epbs);
}