3006 VERIFY[S,U,P] and ASSERT[S,U,P] frequently check if first argument is zero

@@ -18,10 +18,11 @@
  *
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>

@@ -452,12 +453,12 @@
         zfsvfs_t *zfsvfs = zp->z_zfsvfs;
 
         ASSERT(zp->z_unlinked);
         ASSERT(zp->z_links == 0);
 
-        VERIFY3U(0, ==,
-            zap_add_int(zfsvfs->z_os, zfsvfs->z_unlinkedobj, zp->z_id, tx));
+        VERIFY0(zap_add_int(zfsvfs->z_os, zfsvfs->z_unlinkedobj,
+            zp->z_id, tx));
 }
 
 /*
  * Clean up any znodes that had no links when we either crashed or
  * (force) umounted the file system.

@@ -669,12 +670,12 @@
                 mutex_exit(&xzp->z_lock);
                 zfs_unlinked_add(xzp, tx);
         }
 
         /* Remove this znode from the unlinked set */
-        VERIFY3U(0, ==,
-            zap_remove_int(zfsvfs->z_os, zfsvfs->z_unlinkedobj, zp->z_id, tx));
+        VERIFY0(zap_remove_int(zfsvfs->z_os, zfsvfs->z_unlinkedobj,
+            xzp->z_id, tx));
 
         zfs_znode_delete(zp, tx);
 
         dmu_tx_commit(tx);
 out: