From owner-p4-projects@FreeBSD.ORG Thu Dec 23 21:01:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2E4B106566C; Thu, 23 Dec 2010 21:01:50 +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 74A7A106566B for ; Thu, 23 Dec 2010 21:01:50 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 477928FC0C for ; Thu, 23 Dec 2010 21:01:50 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oBNL1ole031042 for ; Thu, 23 Dec 2010 21:01:50 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oBNL1oMm031038 for perforce@freebsd.org; Thu, 23 Dec 2010 21:01:50 GMT (envelope-from trasz@freebsd.org) Date: Thu, 23 Dec 2010 21:01:50 GMT Message-Id: <201012232101.oBNL1oMm031038@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2010 21:01:50 -0000 http://p4web.freebsd.org/@@187167?ac=10 Change 187167 by trasz@trasz_victim on 2010/12/23 21:01:45 In struct pts_softc, replace uidinfo with ucred. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#22 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#22 (text+ko) ==== @@ -98,7 +98,7 @@ struct cdev *pts_cdev; /* (c) Master device node. */ #endif /* PTS_EXTERNAL */ - struct uidinfo *pts_uidinfo; /* (c) Resource limit. */ + struct ucred *pts_cred; /* (c) Resource limit. */ }; /* @@ -684,8 +684,8 @@ if (psc->pts_unit >= 0) free_unr(pts_pool, psc->pts_unit); - chgptscnt(psc->pts_uidinfo, -1, 0); - uifree(psc->pts_uidinfo); + chgptscnt(psc->pts_cred->cr_ruidinfo, -1, 0); + crfree(psc->pts_cred); knlist_destroy(&psc->pts_inpoll.si_note); knlist_destroy(&psc->pts_outpoll.si_note); @@ -719,14 +719,14 @@ struct tty *tp; struct pts_softc *psc; struct proc *p = td->td_proc; - struct uidinfo *uid = td->td_ucred->cr_ruidinfo; + struct ucred *cred = td->td_ucred; /* Resource limiting. */ error = rusage_add(p, RUSAGE_NPTS, 1); if (error != 0) return (EAGAIN); PROC_LOCK(p); - ok = chgptscnt(uid, 1, lim_cur(p, RLIMIT_NPTS)); + ok = chgptscnt(cred->cr_ruidinfo, 1, lim_cur(p, RLIMIT_NPTS)); PROC_UNLOCK(p); if (!ok) { rusage_sub(p, RUSAGE_NPTS, 1); @@ -737,7 +737,7 @@ unit = alloc_unr(pts_pool); if (unit < 0) { rusage_sub(p, RUSAGE_NPTS, 1); - chgptscnt(uid, -1, 0); + chgptscnt(cred->cr_ruidinfo, -1, 0); return (EAGAIN); } @@ -747,8 +747,7 @@ cv_init(&psc->pts_outwait, "ptsout"); psc->pts_unit = unit; - psc->pts_uidinfo = uid; - uihold(uid); + psc->pts_cred = crhold(cred); tp = tty_alloc(&pts_class, psc); knlist_init_mtx(&psc->pts_inpoll.si_note, tp->t_mtx); @@ -771,14 +770,14 @@ struct tty *tp; struct pts_softc *psc; struct proc *p = td->td_proc; - struct uidinfo *uid = td->td_ucred->cr_ruidinfo; + struct ucred *cred = td->td_ucred; /* Resource limiting. */ error = rusage_add(p, RUSAGE_NPTS, 1); if (error != 0) return (EAGAIN); PROC_LOCK(p); - ok = chgptscnt(uid, 1, lim_cur(p, RLIMIT_NPTS)); + ok = chgptscnt(cred->cr_ruidinfo, 1, lim_cur(p, RLIMIT_NPTS)); PROC_UNLOCK(p); if (!ok) { rusage_sub(p, RUSAGE_NPTS, 1); @@ -792,8 +791,7 @@ psc->pts_unit = -1; psc->pts_cdev = dev; - psc->pts_uidinfo = uid; - uihold(uid); + psc->pts_cred = crhold(cred);; tp = tty_alloc(&pts_class, psc); knlist_init_mtx(&psc->pts_inpoll.si_note, tp->t_mtx);