Date: Tue, 4 Oct 2011 14:56:33 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r225981 - head/sys/kern Message-ID: <201110041456.p94EuXaV062658@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Tue Oct 4 14:56:33 2011 New Revision: 225981 URL: http://svn.freebsd.org/changeset/base/225981 Log: Actually enforce limit for inheritable resources on fork. MFC after: 3 days Modified: head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Tue Oct 4 14:26:45 2011 (r225980) +++ head/sys/kern/kern_racct.c Tue Oct 4 14:56:33 2011 (r225981) @@ -567,6 +567,12 @@ racct_proc_fork(struct proc *parent, str PROC_LOCK(child); mtx_lock(&racct_lock); +#ifdef RCTL + error = rctl_proc_fork(parent, child); + if (error != 0) + goto out; +#endif + /* * Inherit resource usage. */ @@ -581,12 +587,6 @@ racct_proc_fork(struct proc *parent, str goto out; } -#ifdef RCTL - error = rctl_proc_fork(parent, child); - if (error != 0) - goto out; -#endif - error = racct_add_locked(child, RACCT_NPROC, 1); error += racct_add_locked(child, RACCT_NTHR, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110041456.p94EuXaV062658>