Date: Fri, 7 Dec 2018 16:51:39 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r341702 - head/sys/kern Message-ID: <201812071651.wB7Gpda9084764@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Fri Dec 7 16:51:38 2018 New Revision: 341702 URL: https://svnweb.freebsd.org/changeset/base/341702 Log: fd: use racct_set_unlocked Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c ============================================================================== --- head/sys/kern/kern_descrip.c Fri Dec 7 16:47:34 2018 (r341701) +++ head/sys/kern/kern_descrip.c Fri Dec 7 16:51:38 2018 (r341702) @@ -878,10 +878,8 @@ kern_dup(struct thread *td, u_int mode, int flags, int * the limit on the size of the file descriptor table. */ #ifdef RACCT - if (racct_enable) { - PROC_LOCK(p); - error = racct_set(p, RACCT_NOFILE, new + 1); - PROC_UNLOCK(p); + if (RACCT_ENABLED()) { + error = racct_set_unlocked(p, RACCT_NOFILE, new + 1); if (error != 0) { error = EMFILE; goto unlock; @@ -1751,10 +1749,8 @@ fdalloc(struct thread *td, int minfd, int *result) if (fd >= fdp->fd_nfiles) { allocfd = min(fd * 2, maxfd); #ifdef RACCT - if (racct_enable) { - PROC_LOCK(p); - error = racct_set(p, RACCT_NOFILE, allocfd); - PROC_UNLOCK(p); + if (RACCT_ENABLED()) { + error = racct_set_unlocked(p, RACCT_NOFILE, allocfd); if (error != 0) return (EMFILE); } @@ -2266,11 +2262,8 @@ fdescfree(struct thread *td) MPASS(fdp != NULL); #ifdef RACCT - if (racct_enable) { - PROC_LOCK(p); - racct_set(p, RACCT_NOFILE, 0); - PROC_UNLOCK(p); - } + if (RACCT_ENABLED()) + racct_set_unlocked(p, RACCT_NOFILE, 0); #endif if (p->p_fdtol != NULL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812071651.wB7Gpda9084764>