From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 23 18:33:09 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id DF917940;
 Wed, 23 Oct 2013 18:33:09 +0000 (UTC)
 (envelope-from will@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CDEA32401;
 Wed, 23 Oct 2013 18:33:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NIX9kC093662;
 Wed, 23 Oct 2013 18:33:09 GMT (envelope-from will@svn.freebsd.org)
Received: (from will@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NIX95g093661;
 Wed, 23 Oct 2013 18:33:09 GMT (envelope-from will@svn.freebsd.org)
Message-Id: <201310231833.r9NIX95g093661@svn.freebsd.org>
From: Will Andrews <will@FreeBSD.org>
Date: Wed, 23 Oct 2013 18:33:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r257001 - projects/vps/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 18:33:09 -0000

Author: will
Date: Wed Oct 23 18:33:09 2013
New Revision: 257001
URL: http://svnweb.freebsd.org/changeset/base/257001

Log:
  Sync with svn.7he.at/vps/trunk r196.
  
  r196 | klaus | 2013-07-29 07:29:32 -0600 (Mon, 29 Jul 2013) | 3 lines
  Fixed a bug where an already deleted vps was referenced in deadlkres().
  
  Submitted by:	Klaus P. Ohrhallinger <k@7he.at>

Modified:
  projects/vps/sys/kern/kern_clock.c

Modified: projects/vps/sys/kern/kern_clock.c
==============================================================================
--- projects/vps/sys/kern/kern_clock.c	Wed Oct 23 18:32:25 2013	(r257000)
+++ projects/vps/sys/kern/kern_clock.c	Wed Oct 23 18:33:09 2013	(r257001)
@@ -214,6 +214,7 @@ deadlkres(void)
 		save_vps = curthread->td_vps;
 		sx_slock(&vps_all_lock);
 		LIST_FOREACH_SAFE(vps, &vps_head, vps_all, vps_tmp) {
+		vps_ref(vps, (struct ucred *)&deadlkres);
 		sx_sunlock(&vps_all_lock);
 		curthread->td_vps = vps;
 #endif /* VPS */
@@ -233,6 +234,7 @@ deadlkres(void)
 			tryl++;
 			pause("allproc", sleepfreq * hz);
 #ifdef VPS
+			vps_deref(vps, (struct ucred *)&deadlkres);
 			sx_slock(&vps_all_lock);
 #endif /* VPS */
 			continue;
@@ -330,6 +332,7 @@ deadlkres(void)
 		}
 		sx_sunlock(&V_allproc_lock);
 #ifdef VPS
+		vps_deref(vps, (struct ucred *)&deadlkres);
 		sx_slock(&vps_all_lock);
 		}
 		sx_sunlock(&vps_all_lock);