From 0cb8b6a9b746fba6bbf707e4d438cb48c9e7e545 Mon Sep 17 00:00:00 2001
From: Marko Zec <zec@FreeBSD.org>
Date: Mon, 24 Aug 2009 10:16:19 +0000
Subject: [PATCH] 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)
MFC after:	3 days
---
 sys/kern/kern_jail.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 8f185833e8a..892d2111bed 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -2456,7 +2456,7 @@ prison_deref(struct prison *pr, int flags)
 		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) {