diff options
| author | Brian Behlendorf <[email protected]> | 2018-10-09 15:21:27 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-10-12 11:24:04 -0700 |
| commit | d6c745830f2529643f1967e1f8a5d0abacba4585 (patch) | |
| tree | 0c36a5a6eb4029593b6e5b0b9573e9ab0a5465d6 | |
| parent | 3c94dd7b7b102d398e70670a36ca29a84e31bc46 (diff) | |
Revert "Allow ECKSUM in vdev_checkpoint_sm_object()"
This reverts commit e927fc8a522e1c0db89955cc555841aa23bbd634.
Reviewed by: Tim Chase <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Serapheim Dimitropoulos <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #7921
| -rw-r--r-- | module/zfs/vdev.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index dfe444368..5f4ff8620 100644 --- 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); } |