Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2009-01-21 11:02:17 -08:00
commit 5a8b66fe04
1 changed files with 1 additions and 3 deletions

View File

@ -468,8 +468,7 @@ vdev_disk_io_done(zio_t *zio)
* asynchronous removal of the device. Otherwise, probe the device and * asynchronous removal of the device. Otherwise, probe the device and
* make sure it's still accessible. * make sure it's still accessible.
*/ */
if (zio->io_error == EIO) { VERIFY3S(zio->io_error, ==, 0);
ASSERT(0); /* XXX: Not yet supported */
#if 0 #if 0
vdev_t *vd = zio->io_vd; vdev_t *vd = zio->io_vd;
vdev_disk_t *dvd = vd->vdev_tsd; vdev_disk_t *dvd = vd->vdev_tsd;
@ -482,7 +481,6 @@ vdev_disk_io_done(zio_t *zio)
} }
#endif #endif
} }
}
vdev_ops_t vdev_disk_ops = { vdev_ops_t vdev_disk_ops = {
vdev_disk_open, vdev_disk_open,