From e05725b117836db173257fae43fb0746eb857fb5 Mon Sep 17 00:00:00 2001
From: bonwick <none@none>
Date: Tue, 27 Nov 2007 22:58:05 -0800
Subject: 6354519 stack overflow in zfs due to zio pipeline 6533726
 single-threaded checksum & parity calculations limit write bandwidth 6547248
 ztest detects a future leak when there is none 6604198 zfs only using single
 cpu for compression (part II)

--HG--
rename : usr/src/uts/common/fs/zfs/rprwlock.c => deleted_files/usr/src/uts/common/fs/zfs/rprwlock.c
rename : usr/src/uts/common/fs/zfs/sys/rprwlock.h => deleted_files/usr/src/uts/common/fs/zfs/sys/rprwlock.h
---
 usr/src/uts/common/fs/zfs/vdev.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'usr/src/uts/common/fs/zfs/vdev.c')

diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c
index 2a2dc1d625..2b4c663a1a 100644
--- a/usr/src/uts/common/fs/zfs/vdev.c
+++ b/usr/src/uts/common/fs/zfs/vdev.c
@@ -136,6 +136,9 @@ vdev_lookup_top(spa_t *spa, uint64_t vdev)
 {
 	vdev_t *rvd = spa->spa_root_vdev;
 
+	ASSERT(spa_config_held(spa, RW_READER) ||
+	    curthread == spa->spa_scrub_thread);
+
 	if (vdev < rvd->vdev_children)
 		return (rvd->vdev_child[vdev]);
 
@@ -1459,18 +1462,6 @@ vdev_psize_to_asize(vdev_t *vd, uint64_t psize)
 	return (vd->vdev_ops->vdev_op_asize(vd, psize));
 }
 
-void
-vdev_io_start(zio_t *zio)
-{
-	zio->io_vd->vdev_ops->vdev_op_io_start(zio);
-}
-
-void
-vdev_io_done(zio_t *zio)
-{
-	zio->io_vd->vdev_ops->vdev_op_io_done(zio);
-}
-
 const char *
 vdev_description(vdev_t *vd)
 {
-- 
cgit v1.2.3