comparison usr/src/uts/common/fs/zfs/dmu_tx.c @ 13765:9410cf539b11

backout 3006: causes 3046 (panics after mounting root)
author Richard Lowe <richlowe@richlowe.net>
date Wed, 01 Aug 2012 16:40:39 -0400
parents 38b4aca480b3
children f0c17d471b7a
comparison
equal deleted inserted replaced
13764:38b4aca480b3 13765:9410cf539b11
897 dmu_tx_hold_t *txh; 897 dmu_tx_hold_t *txh;
898 spa_t *spa = tx->tx_pool->dp_spa; 898 spa_t *spa = tx->tx_pool->dp_spa;
899 uint64_t memory, asize, fsize, usize; 899 uint64_t memory, asize, fsize, usize;
900 uint64_t towrite, tofree, tooverwrite, tounref, tohold, fudge; 900 uint64_t towrite, tofree, tooverwrite, tounref, tohold, fudge;
901 901
902 ASSERT0(tx->tx_txg); 902 ASSERT3U(tx->tx_txg, ==, 0);
903 903
904 if (tx->tx_err) 904 if (tx->tx_err)
905 return (tx->tx_err); 905 return (tx->tx_err);
906 906
907 if (spa_suspended(spa)) { 907 if (spa_suspended(spa)) {