Mercurial > illumos > illumos-gate
diff usr/src/uts/common/fs/zfs/dbuf.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 | e3a9ae14a119 |
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/dbuf.c Tue Jul 31 06:38:31 2012 -0700 +++ b/usr/src/uts/common/fs/zfs/dbuf.c Wed Aug 01 16:40:39 2012 -0400 @@ -328,7 +328,7 @@ } else if (db->db_blkid == DMU_SPILL_BLKID) { ASSERT(dn != NULL); ASSERT3U(db->db.db_size, >=, dn->dn_bonuslen); - ASSERT0(db->db.db_offset); + ASSERT3U(db->db.db_offset, ==, 0); } else { ASSERT3U(db->db.db_offset, ==, db->db_blkid * db->db.db_size); } @@ -2308,7 +2308,7 @@ dbuf_dirty_record_t **drp; ASSERT(*datap != NULL); - ASSERT0(db->db_level); + ASSERT3U(db->db_level, ==, 0); ASSERT3U(dn->dn_phys->dn_bonuslen, <=, DN_MAX_BONUSLEN); bcopy(*datap, DN_BONUS(dn->dn_phys), dn->dn_phys->dn_bonuslen); DB_DNODE_EXIT(db); @@ -2507,7 +2507,7 @@ uint64_t txg = zio->io_txg; dbuf_dirty_record_t **drp, *dr; - ASSERT0(zio->io_error); + ASSERT3U(zio->io_error, ==, 0); ASSERT(db->db_blkptr == bp); if (zio->io_flags & ZIO_FLAG_IO_REWRITE) {