d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always use atomic_fetchadd() when updating per-user accounting values.

Browse Source 
This avoids re-reading a variable after it has been updated via an
atomic op.  It is just a cosmetic cleanup as the read value was only
used to control a diagnostic printf that should rarely occur (if ever).

Reviewed by:	kib
Differential Revision:	https://reviews.freebsd.org/D13768
This commit is contained in:
John Baldwin 2018-01-04 22:07:58 +00:00
parent 3160862437
commit 2da93c21ec
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/kern_resource.c
View File

@ -1384,18 +1384,17 @@ ui_racct_foreach(void (*callback)(struct racct *racct,
static inline int
chglimit(struct uidinfo *uip, long *limit, int diff, rlim_t max, const char *name)
{
long new;
/* Don't allow them to exceed max, but allow subtraction. */
new = atomic_fetchadd_long(limit, (long)diff) + diff;
if (diff > 0 && max != 0) {
if (atomic_fetchadd_long(limit, (long)diff) + diff > max) {
if (new < 0 || new > max) {
atomic_subtract_long(limit, (long)diff);
return (0);
}
} else {
atomic_add_long(limit, (long)diff);
if (*limit < 0)
printf("negative %s for uid = %d\n", name, uip->ui_uid);
}
} else if (new < 0)
printf("negative %s for uid = %d\n", name, uip->ui_uid);
return (1);
}