Mercurial > illumos > illumos-gate

diff usr/src/uts/common/fs/zfs/zap_micro.c @ 13765:9410cf539b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/zap_micro.c	Tue Jul 31 06:38:31 2012 -0700
+++ b/usr/src/uts/common/fs/zfs/zap_micro.c	Wed Aug 01 16:40:39 2012 -0400
@@ -506,7 +506,7 @@
 			return (mzap_upgrade(zapp, tx, 0));
 		}
 		err = dmu_object_set_blocksize(os, obj, newsz, 0, tx);
-		ASSERT0(err);
+		ASSERT3U(err, ==, 0);
 		zap->zap_m.zap_num_chunks =
 		    db->db_size / MZAP_ENT_LEN - 1;
 	}
@@ -601,7 +601,7 @@
 		/* Only fat zap supports flags; upgrade immediately. */
 		VERIFY(0 == zap_lockdir(os, obj, tx, RW_WRITER,
 		    B_FALSE, B_FALSE, &zap));
-		VERIFY0(mzap_upgrade(&zap, tx, flags));
+		VERIFY3U(0, ==, mzap_upgrade(&zap, tx, flags));
 		zap_unlockdir(zap);
 	}
 }