2739c2739,2744
< if (error != ENOENT && error != 0) {
---
> if (error == ENOENT) {
> VERIFY(!nvlist_exists(mos_config,
> ZPOOL_CONFIG_HAS_PER_VDEV_ZAPS));
> spa->spa_avz_action = AVZ_ACTION_INITIALIZE;
> ASSERT0(vdev_count_verify_zaps(spa->spa_root_vdev));
> } else if (error != 0) {
2741,2742c2746
< } else if (error == 0 && !nvlist_exists(mos_config,
< ZPOOL_CONFIG_HAS_PER_VDEV_ZAPS)) {
---
> } else if (!nvlist_exists(mos_config, ZPOOL_CONFIG_HAS_PER_VDEV_ZAPS)) {
6505a6510
> spa->spa_avz_action == AVZ_ACTION_INITIALIZE ||