svn commit: r200458 - user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Kip Macy]

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);