diff options
| author | smh <smh@FreeBSD.org> | 2014-11-21 17:08:28 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2014-11-21 17:08:28 +0000 |
| commit | 95f3efce798ee66d1efb2960539cee6149d60aa2 (patch) | |
| tree | bcd75179c51b97979257c8bf9301690e39372893 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | |
| parent | 8273e80777c3a4960018df0b3bb35ce43281fca2 (diff) | |
| download | FreeBSD-src-95f3efce798ee66d1efb2960539cee6149d60aa2.zip FreeBSD-src-95f3efce798ee66d1efb2960539cee6149d60aa2.tar.gz | |
MFC r274619:
Disable TRIM on file backed ZFS vdevs and fix TRIM on init
Sponsored by: Multiplay
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c index 210968e..4cc0472 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c @@ -832,6 +832,11 @@ vdev_geom_io_start(zio_t *zio) return (ZIO_PIPELINE_STOP); } sendreq: + ASSERT(zio->io_type == ZIO_TYPE_READ || + zio->io_type == ZIO_TYPE_WRITE || + zio->io_type == ZIO_TYPE_FREE || + zio->io_type == ZIO_TYPE_IOCTL); + cp = vd->vdev_tsd; if (cp == NULL) { zio->io_error = SET_ERROR(ENXIO); |
