From owner-svn-src-user@FreeBSD.ORG Sat Dec 12 23:57:19 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2D621065676; Sat, 12 Dec 2009 23:57:19 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E1E2F8FC22; Sat, 12 Dec 2009 23:57:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBCNvJ7b067727; Sat, 12 Dec 2009 23:57:19 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBCNvJEA067724; Sat, 12 Dec 2009 23:57:19 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200912122357.nBCNvJEA067724@svn.freebsd.org> From: Kip Macy Date: Sat, 12 Dec 2009 23:57:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200458 - user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Dec 2009 23:57:20 -0000 Author: kmacy Date: Sat Dec 12 23:57:19 2009 New Revision: 200458 URL: http://svn.freebsd.org/changeset/base/200458 Log: - remove unused vnode reference - don't try to sync cache if the vdev has no backing vnode Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Sat Dec 12 23:52:20 2009 (r200457) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Sat Dec 12 23:57:19 2009 (r200458) @@ -1060,8 +1060,6 @@ vdev_open(vdev_t *vd) * inconsistently account for existing bp's. */ if (vd->vdev_top == vd) { - struct vnode *vp; - vd->vdev_deflate_ratio = (1<<17) / (vdev_psize_to_asize(vd, 1<<17) >> SPA_MINBLOCKSHIFT); Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Sat Dec 12 23:52:20 2009 (r200457) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Sat Dec 12 23:57:19 2009 (r200458) @@ -444,7 +444,7 @@ zio_create(zio_t *pio, spa_t *spa, uint6 * This also allows us to skip disk I/O if we hit in the * page cache. */ - if (((vd == NULL) || (vd->vdev_parent == NULL)) && + if (((vd != NULL) && (vd->vdev_vnode != NULL)) && ((type == ZIO_TYPE_WRITE) || (type == ZIO_TYPE_READ))) io_bypass = zbio_sync_cache(spa, bp, txg, data, size, type == ZIO_TYPE_WRITE ? BIO_WRITE : BIO_READ);