Date: Tue, 26 Jan 2016 13:40:22 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r294818 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201601261340.u0QDeMXx030434@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue Jan 26 13:40:22 2016 New Revision: 294818 URL: https://svnweb.freebsd.org/changeset/base/294818 Log: 6494 ASSERT supported zio_types for file and disk vdevs Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Albert Lee <trisk@omniti.com> Author: Steven Hartland <steven.hartland@multiplay.co.uk> illumos/illumos-gate@f693d300fbefaa2bd9a229a874b5994532a30d87 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_file.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c Tue Jan 26 13:37:30 2016 (r294817) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c Tue Jan 26 13:40:22 2016 (r294818) @@ -796,6 +796,8 @@ vdev_disk_io_start(zio_t *zio) return; } + ASSERT(zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE); + vb = kmem_alloc(sizeof (vdev_buf_t), KM_SLEEP); vb->vb_io = zio; Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_file.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_file.c Tue Jan 26 13:37:30 2016 (r294817) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_file.c Tue Jan 26 13:40:22 2016 (r294818) @@ -211,6 +211,8 @@ vdev_file_io_start(zio_t *zio) return; } + ASSERT(zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE); + vb = kmem_alloc(sizeof (vdev_buf_t), KM_SLEEP); vb->vb_io = zio;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601261340.u0QDeMXx030434>