Author: zec
Date: Fri Aug 28 19:15:17 2009
New Revision: 196623
URL: http://svn.freebsd.org/changeset/base/196623
Log:
MFC r196505:
When "jail -c vnet" request fails, the current code actually creates and
leaves behind an orphaned vnet. This change ensures that such vnets get
released.
This change affects only options VIMAGE builds.
Submitted by: jamie
Discussed with: bz
Approved by: re (rwatson), julian (mentor)
Approved by: re (rwatson)
Modified:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/kern/kern_jail.c
Modified: stable/8/sys/kern/kern_jail.c
==============================================================================
--- stable/8/sys/kern/kern_jail.c Fri Aug 28 19:12:44 2009
(r196622)
+++ stable/8/sys/kern/kern_jail.c Fri Aug 28 19:15:17 2009
(r196623)
@@ -2456,7 +2456,7 @@ prison_deref(struct prison *pr, int flag
sx_downgrade(&allprison_lock);
#ifdef VIMAGE
- if (pr->pr_flags & PR_VNET)
+ if (pr->pr_vnet != ppr->pr_vnet)
vnet_destroy(pr->pr_vnet);
#endif
if (pr->pr_root != NULL) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
