Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Revert "Allow ECKSUM in vdev_checkpoint_sm_object()" 

This reverts commit e927fc8a52.

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
This commit is contained in:
Brian Behlendorf 2018-10-09 15:21:27 -07:00
parent 3c94dd7b7b
commit d6c745830f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/zfs/vdev.c
View File

@ -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. * Gets the checkpoint space map object from the vdev's ZAP.
* Returns the spacemap object, or 0 if it wasn't in the 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. * or the ZAP doesn't exist yet.
*/ */
int int
vdev_checkpoint_sm_object(vdev_t *vd) 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, 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); VDEV_TOP_ZAP_POOL_CHECKPOINT_SM, sizeof (uint64_t), 1, &sm_obj);
if (err != 0 && err != ENOENT) { if (err != 0)
vdev_dbgmsg(vd, "vdev_load: vdev_checkpoint_sm_objset " VERIFY3S(err, ==, ENOENT);
"failed to retrieve checkpoint space map object from "
"vdev ZAP [error=%d]", err);
ASSERT3S(err, ==, ECKSUM);
}
return (sm_obj); return (sm_obj);
} }