modified trap.c trap.h vdev/* include/vdev.h