From owner-p4-projects@FreeBSD.ORG  Thu Jun  4 17:45:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 36A131065672; Thu,  4 Jun 2009 17:45:15 +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 E521C106564A
	for <perforce@freebsd.org>; Thu,  4 Jun 2009 17:45:14 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D48388FC27
	for <perforce@freebsd.org>; Thu,  4 Jun 2009 17:45:14 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54HjERZ016074
	for <perforce@freebsd.org>; Thu, 4 Jun 2009 17:45:14 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54HjEOf016072
	for perforce@freebsd.org; Thu, 4 Jun 2009 17:45:14 GMT
	(envelope-from zec@fer.hr)
Date: Thu, 4 Jun 2009 17:45:14 GMT
Message-Id: <200906041745.n54HjEOf016072@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 163504 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: Thu, 04 Jun 2009 17:45:16 -0000

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

Change 163504 by zec@zec_tpx32 on 2009/06/04 17:45:06

	Revert 163490, i.e. freeing memory on vimage -d is now OK
	again after nailing down at least the most pressing uncancelled
	callout in in6_rmx.c.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#96 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#96 (text+ko) ====

@@ -563,10 +563,8 @@
 	if (vmi->vmi_size) {
 		if (curvnet->mod_data[vmi->vmi_id] == NULL)
 			panic("vi_destroy: %s\n", vmi->vmi_name);
-#ifdef NOTYET
 		free(curvnet->mod_data[vmi->vmi_id], M_VNET);
 		curvnet->mod_data[vmi->vmi_id] = NULL;
-#endif
 	}
 #endif
 
@@ -710,10 +708,6 @@
 	TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) {
 		if (ifp->if_home_vnet != ifp->if_vnet)
 			vi_if_move(NULL, ifp, vip);
-#ifdef NOTYET
-		else
-			if_clone_destroy(ifp->if_xname);
-#endif
 	}
 
 	/* Detach / free per-module state instances. */
@@ -725,9 +719,7 @@
 
 	/* hopefully, we are finally OK to free the vnet container itself! */
 	vnet->vnet_magic_n = 0xdeadbeef;
-#ifdef NOTYET
 	free(vnet, M_VNET);
-#endif
 	free(vprocg, M_VPROCG);
 	free(vip, M_VIMAGE);