From owner-p4-projects@FreeBSD.ORG  Fri Feb  1 03:38:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C4F6C16A419; Fri,  1 Feb 2008 03:38:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8AAB016A468
	for <perforce@freebsd.org>; Fri,  1 Feb 2008 03:38:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8034513C458
	for <perforce@freebsd.org>; Fri,  1 Feb 2008 03:38:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m113cYBn045391
	for <perforce@freebsd.org>; Fri, 1 Feb 2008 03:38:34 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m113cYKQ045388
	for perforce@freebsd.org; Fri, 1 Feb 2008 03:38:34 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 1 Feb 2008 03:38:34 GMT
Message-Id: <200802010338.m113cYKQ045388@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134571 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Feb 2008 03:38:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=134571

Change 134571 by jb@jb_freebsd1 on 2008/02/01 03:37:36

	Undo an over merge.

Affected files ...

.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 edit

Differences ...

==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 (text+ko) ====

@@ -352,7 +352,7 @@
 				zv->zv_state = 2;
 				wakeup(&zv->zv_state);
 				mtx_unlock(&zv->zv_queue_mtx);
-				kproc_exit(0);
+				kthread_exit(0);
 			}
 			msleep(&zv->zv_queue, &zv->zv_queue_mtx, PRIBIO | PDROP,
 			    "zvol:io", 0);
@@ -543,7 +543,7 @@
 	bioq_init(&zv->zv_queue);
 	mtx_init(&zv->zv_queue_mtx, "zvol", NULL, MTX_DEF);
 	zv->zv_state = 0;
-	kproc_create(zvol_worker, zv, NULL, 0, 0, "zvol:worker %s", pp->name);
+	kthread_create(zvol_worker, zv, NULL, 0, 0, "zvol:worker %s", pp->name);
 
 	zvol_minors++;
 end: