From owner-svn-src-user@FreeBSD.ORG  Sat May 16 23:33:07 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 E1215106566C;
	Sat, 16 May 2009 23:33:07 +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 D13888FC13;
	Sat, 16 May 2009 23:33:07 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4GNX7vS007487;
	Sat, 16 May 2009 23:33:07 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4GNX7cU007485;
	Sat, 16 May 2009 23:33:07 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905162333.n4GNX7cU007485@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 16 May 2009 23:33:07 +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: r192233 - user/kmacy/ZFS_MFC/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 May 2009 23:33:08 -0000

Author: kmacy
Date: Sat May 16 23:33:07 2009
New Revision: 192233
URL: http://svn.freebsd.org/changeset/base/192233

Log:
  deregister osd on thread exit

Modified:
  user/kmacy/ZFS_MFC/sys/kern/kern_proc.c
  user/kmacy/ZFS_MFC/sys/kern/kern_thread.c

Modified: user/kmacy/ZFS_MFC/sys/kern/kern_proc.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/kern/kern_proc.c	Sat May 16 22:54:16 2009	(r192232)
+++ user/kmacy/ZFS_MFC/sys/kern/kern_proc.c	Sat May 16 23:33:07 2009	(r192233)
@@ -200,6 +200,8 @@ proc_dtor(void *mem, int size, void *arg
 		    ("bad number of threads in exiting process"));
 		KASSERT(STAILQ_EMPTY(&p->p_ktr), ("proc_dtor: non-empty p_ktr"));
 #endif
+		/* Free all OSD associated to this thread. */
+		osd_thread_exit(td);
 
 		/* Dispose of an alternate kstack, if it exists.
 		 * XXX What if there are more than one thread in the proc?

Modified: user/kmacy/ZFS_MFC/sys/kern/kern_thread.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/kern/kern_thread.c	Sat May 16 22:54:16 2009	(r192232)
+++ user/kmacy/ZFS_MFC/sys/kern/kern_thread.c	Sat May 16 23:33:07 2009	(r192233)
@@ -133,6 +133,9 @@ thread_ctor(void *mem, int size, void *a
 #ifdef AUDIT
 	audit_thread_alloc(td);
 #endif
+	/* Free all OSD associated to this thread. */
+	osd_thread_exit(td);
+
 	umtx_thread_alloc(td);
 	return (0);
 }