1076c1076,1077
< for (i = 0; i < spa->spa_l2cache.sav_count; i++)
---
> for (i = 0; i < spa->spa_l2cache.sav_count; i++) {
> vdev_clear_stats(spa->spa_l2cache.sav_vdevs[i]);
1077a1079
> }
1304a1307,1308
> ASSERT(vd->vdev_isl2cache);
>
1308,1309c1312,1313
< (void) vdev_close(vd);
< spa_l2cache_remove(vd);
---
> vdev_clear_stats(vd);
> vdev_free(vd);
1952c1956
< error = vdev_validate(rvd);
---
> error = vdev_validate(rvd, mosconfig);
2820a2825
> vdev_free(vd);
2930,2933d2934
< if (vd->vdev_isl2cache)
< spa_l2cache_remove(vd);
< vdev_clear_stats(vd);
< (void) vdev_close(vd);
3932c3933
< VDEV_ALLOC_ADD)) != 0)
---
> VDEV_ALLOC_ATTACH)) != 0)