Illumos #3189 kernel panic in test hotspare_onoffline_004_neg

Christopher Siden · behlendorf · commit b077fd4c4e16 · 2013-01-14T10:34:53.000-08:00
3189 kernel panic in ZFS test suite during hotspare_onoffline_004_neg Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Arne Jansen <sensille@gmx.net> Approved by: Dan McDonald <danmcd@nexenta.com> References: illumos/illumos-gate@8f0b538 changeset: 13818:e9ad0a945d45 https://www.illumos.org/issues/3189 Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
diff --git 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 += MIN(blkcnt, (nl1blks >> epbs))
+			txh->txh_memory_tohold += MAX(MIN(blkcnt, nl1blks), 1)
 			    << dn->dn_indblkshift;
 			blkcnt = 1 + (blkcnt >> epbs);
 		}

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ dmu_tx_count_free(dmu_tx_hold_t *txh, uint64_t off, uint64_t len)`
`589`	`589`	`(dn->dn_indblkshift - SPA_BLKPTRSHIFT);`
`590`	`590`
`591`	`591`	`while (level++ < maxlevel) {`
`592`		`- txh->txh_memory_tohold += MIN(blkcnt, (nl1blks >> epbs))`
	`592`	`+ txh->txh_memory_tohold += MAX(MIN(blkcnt, nl1blks), 1)`
`593`	`593`	`<< dn->dn_indblkshift;`
`594`	`594`	`blkcnt = 1 + (blkcnt >> epbs);`
`595`	`595`	`}`