Revert "Allow ECKSUM in vdev_checkpoint_sm_object()"

This reverts commit e927fc8a522e1c0db89955cc555841aa23bbd634.

Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Serapheim Dimitropoulos <serapheim.dimitro@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #7921

diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c
index dfe4443680227a46c683ae5063035950d66e0037..5f4ff86207123feb4be75f1115c55d043a3a5e54 100644 (file)
--- a/module/zfs/vdev.c
+++ b/module/zfs/vdev.c
@@ -2896,8 +2896,8 @@ vdev_resilver_needed(vdev_t *vd, uint64_t *minp, uint64_t *maxp)
 
 /*
  * Gets the checkpoint space map object from the vdev's ZAP.
- * Returns the spacemap object, or 0 if it wasn't in the ZAP,
- * the ZAP doesn't exist yet, or the ZAP is damaged.
+ * Returns the spacemap object, or 0 if it wasn't in the ZAP
+ * or the ZAP doesn't exist yet.
  */
 int
 vdev_checkpoint_sm_object(vdev_t *vd)
@@ -2911,12 +2911,8 @@ vdev_checkpoint_sm_object(vdev_t *vd)
        int err = zap_lookup(spa_meta_objset(vd->vdev_spa), vd->vdev_top_zap,
            VDEV_TOP_ZAP_POOL_CHECKPOINT_SM, sizeof (uint64_t), 1, &sm_obj);
 
-       if (err != 0 && err != ENOENT) {
-               vdev_dbgmsg(vd, "vdev_load: vdev_checkpoint_sm_objset "
-                   "failed to retrieve checkpoint space map object from "
-                   "vdev ZAP [error=%d]", err);
-               ASSERT3S(err, ==, ECKSUM);
-       }
+       if (err != 0)
+               VERIFY3S(err, ==, ENOENT);
 
        return (sm_obj);
 }