63c63
< __FBSDID("$FreeBSD: stable/10/sys/kern/sysv_shm.c 282410 2015-05-04 08:13:05Z kib $");
---
> __FBSDID("$FreeBSD: stable/10/sys/kern/sysv_shm.c 284665 2015-06-21 06:28:26Z trasz $");
654,655c654,664
< PROC_LOCK(td->td_proc);
< if (racct_add(td->td_proc, RACCT_NSHM, 1)) {
---
> if (racct_enable) {
> PROC_LOCK(td->td_proc);
> if (racct_add(td->td_proc, RACCT_NSHM, 1)) {
> PROC_UNLOCK(td->td_proc);
> return (ENOSPC);
> }
> if (racct_add(td->td_proc, RACCT_SHMSIZE, size)) {
> racct_sub(td->td_proc, RACCT_NSHM, 1);
> PROC_UNLOCK(td->td_proc);
> return (ENOMEM);
> }
657d665
< return (ENOSPC);
659,664d666
< if (racct_add(td->td_proc, RACCT_SHMSIZE, size)) {
< racct_sub(td->td_proc, RACCT_NSHM, 1);
< PROC_UNLOCK(td->td_proc);
< return (ENOMEM);
< }
< PROC_UNLOCK(td->td_proc);
675,678c677,682
< PROC_LOCK(td->td_proc);
< racct_sub(td->td_proc, RACCT_NSHM, 1);
< racct_sub(td->td_proc, RACCT_SHMSIZE, size);
< PROC_UNLOCK(td->td_proc);
---
> if (racct_enable) {
> PROC_LOCK(td->td_proc);
> racct_sub(td->td_proc, RACCT_NSHM, 1);
> racct_sub(td->td_proc, RACCT_SHMSIZE, size);
> PROC_UNLOCK(td->td_proc);
> }