From owner-svn-src-head@FreeBSD.ORG Mon Nov 17 18:43:40 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F07AB5AA; Mon, 17 Nov 2014 18:43:39 +0000 (UTC) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anubis.delphij.net", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id CBE37241; Mon, 17 Nov 2014 18:43:39 +0000 (UTC) Received: from zeta.ixsystems.com (unknown [12.229.62.2]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id 99D0C22BED; Mon, 17 Nov 2014 10:43:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=anubis; t=1416249818; x=1416264218; bh=M38WlMs+byjH198guWG0V7Y88dl+XQ9os9C0IuypWk0=; h=Date:From:Reply-To:To:Subject:References:In-Reply-To; b=AcPWMJU5uGqfpSsv2rh117GjpcXBiAyCN2tCdwwoyC2lAwW+xzZDXhuWYnB3Q7yKv V07QhodUl9BR8kwATMzkCBMHBxYLF0M5MvxRWxDkz75QQyDN9nTUH208jcrHn/+gSe 3ohzxzSxt8mvuNpJmy19iRsV0D+Lo3dA2DXHMF2s= Message-ID: <546A41DA.9020008@delphij.net> Date: Mon, 17 Nov 2014 10:43:38 -0800 From: Xin Li Reply-To: d@delphij.net Organization: The FreeBSD Project MIME-Version: 1.0 To: Steven Hartland , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r274619 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201411171132.sAHBWBMU006778@svn.freebsd.org> In-Reply-To: <201411171132.sAHBWBMU006778@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 18:43:40 -0000 -----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 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-----