-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 11/17/14 03:32, Steven Hartland wrote: > Author: smh Date: Mon Nov 17 11:32:10 2014 New Revision: 274619 > URL: https://svnweb.freebsd.org/changeset/base/274619 > > Log: Disable TRIM on file backed ZFS vdevs and fix TRIM on init > > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c > ============================================================================== > > - --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c Mon Nov 17 09:19:09 2014 (r274618) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c > Mon Nov 17 11:32:10 2014 (r274619) @@ -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: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c > ============================================================================== > > - --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c Mon Nov 17 09:19:09 2014 (r274618) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c > Mon Nov 17 11:32:10 2014 (r274619) @@ -129,6 +129,8 @@ skip_open: > return (error); } > > + vd->vdev_notrim = B_TRUE; + *max_psize = *psize = vattr.va_size; > *logical_ashift = SPA_MINBLOCKSHIFT; *physical_ashift = > SPA_MINBLOCKSHIFT; @@ -185,6 +187,8 @@ vdev_file_io_start(zio_t > *zio) return; } > > + ASSERT(zio->io_type == ZIO_TYPE_READ || zio->io_type == > ZIO_TYPE_WRITE); + zio->io_error = vn_rdwr(zio->io_type == > ZIO_TYPE_READ ? UIO_READ : UIO_WRITE, vp, zio->io_data, > zio->io_size, zio->io_offset, UIO_SYSSPACE, 0, RLIM64_INFINITY, > kcred, &resid); >
Please upstream both file's assertion changes. Cheers, - -- Xin LI <delp...@delphij.net> https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 iQIcBAEBCgAGBQJUakHZAAoJEJW2GBstM+nsBCsP/REPNGaorCxDk77Q18wu/lS6 tL5g9FrGeFJINKlgGSGgr3mStrWGNCTKPxErK6kbEitX2P47ynMuHxQu3M2UzmUr OANSiqHn0bJ0thv8FOE4ldbxO5i8uI9XfpfCX65yZS+TeDsOWMp8TuVUJqHkZdXD zPEV/isfewgUQ3UIC0ECy5v2BpnnzdsjziLsi0vmJ9Zcx5SD7Pkna9FlJiwWT53G 5NF2JYhTpbNlPacI+vMFPSYMmqaT4o32tx9JP0VJqjGU6RPkXSu9Id6m4CbFpVDD 5ak6iMLkdiCasGQ9g/+CMkOBLu3I/bomZvg/NVZEQ4rhKu8uZ3Mx67nL1f/KXq1R s66VI765yqmgWIhxHqYtOCWTZ73Fs9zwe7hluh3x9tQ6tphOD/LG05nxQiRt9XoI FC5eA6SrKNNfNM1P+HQ21fTJbHt3fvn8Y+WAS60bK5KjW7DI8zCirSlUmF0Euyn0 xXeh9xQtEtiX+trOSphrcg5445mXcGUenj2qmcwkufHfQ39stGkvSJ28yRiLqegc NMcxTkbup/1puH0dDaLGl2+k+RTfX7Z4PyaetqTSTJ1LX6bNAkICCVo/kM4gpKIT 1vxwOzHPTrEOzUOF7M+em5Uqh5sdBBbgxqI9HkpBgqbmYIDUg2SpH5XTGMDazdnO kHNe8ABOdFm2zf2uyG+O =Ffj/ -----END PGP SIGNATURE----- _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
