From owner-p4-projects@FreeBSD.ORG  Sat Aug 15 12:58:59 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CAC5F106568C; Sat, 15 Aug 2009 12:58:59 +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 8F54F1065691
	for <perforce@freebsd.org>; Sat, 15 Aug 2009 12:58:59 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D6928FC51
	for <perforce@freebsd.org>; Sat, 15 Aug 2009 12:58:59 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7FCwxr2067421
	for <perforce@freebsd.org>; Sat, 15 Aug 2009 12:58:59 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7FCwxTa067419
	for perforce@freebsd.org; Sat, 15 Aug 2009 12:58:59 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 15 Aug 2009 12:58:59 GMT
Message-Id: <200908151258.n7FCwxTa067419@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167360 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: Sat, 15 Aug 2009 12:59:00 -0000

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

Change 167360 by trasz@trasz_anger on 2009/08/15 12:58:43

	Unbreak pts accounting.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#7 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#7 (text+ko) ====

@@ -688,7 +688,6 @@
 		free_unr(pts_pool, psc->pts_unit);
 
 	chgptscnt(psc->pts_uidinfo, -1, 0);
-	hrl_free(HRL_RESOURCE_PTY, 1);
 	uifree(psc->pts_uidinfo);
 
 	knlist_destroy(&psc->pts_inpoll.si_note);
@@ -725,7 +724,7 @@
 	/* Resource limiting. */
 	PROC_LOCK(p);
 	ok = chgptscnt(uid, 1, lim_cur(p, RLIMIT_NPTS));
-	error = hrl_alloc(HRL_RESOURCE_PTY, 1);
+	error = hrl_alloc_proc(p, HRL_RESOURCE_PTY, 1);
 	PROC_UNLOCK(p);
 	if (ok != !error)
 		printf("pts_alloc: ok = %d, error = %d\n", ok, error);
@@ -736,13 +735,13 @@
 	unit = alloc_unr(pts_pool);
 	if (unit < 0) {
 		chgptscnt(uid, -1, 0);
-		hrl_free(HRL_RESOURCE_PTY, 1);
+		hrl_free_proc(p, HRL_RESOURCE_PTY, 1);
 		return (EAGAIN);
 	}
 	if (unit > pts_maxdev) {
 		free_unr(pts_pool, unit);
 		chgptscnt(uid, -1, 0);
-		hrl_free(HRL_RESOURCE_PTY, 1);
+		hrl_free_proc(p, HRL_RESOURCE_PTY, 1);
 		return (EAGAIN);
 	}
 
@@ -781,7 +780,7 @@
 	/* Resource limiting. */
 	PROC_LOCK(p);
 	ok = chgptscnt(uid, 1, lim_cur(p, RLIMIT_NPTS));
-	error = hrl_alloc(HRL_RESOURCE_PTY, 1);
+	error = hrl_alloc_proc(p, HRL_RESOURCE_PTY, 1);
 	PROC_UNLOCK(p);
 	if (ok != !error)
 		printf("pts_alloc: ok = %d, error = %d\n", ok, error);