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

nit: Rename racct_alloc_resource to racct_adjust_resource.

Browse Source 
This is more accurate as the amount can be negative.

MFC after:	2 weeks
This commit is contained in:
jlh 2015-06-14 08:33:14 +00:00
parent 5c79c74f6b
commit a670077509
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/kern/kern_racct.c
View File

@ -500,7 +500,7 @@ racct_destroy(struct racct **racct)
* may be less than zero.
*/
static void
racct_alloc_resource(struct racct *racct, int resource,
racct_adjust_resource(struct racct *racct, int resource,
uint64_t amount)
{
@ -553,7 +553,7 @@ racct_add_locked(struct proc *p, int resource, uint64_t amount)
return (error);
}
#endif
racct_alloc_resource(p->p_racct, resource, amount);
racct_adjust_resource(p->p_racct, resource, amount);
racct_add_cred_locked(p->p_ucred, resource, amount);
return (0);
@ -587,11 +587,11 @@ racct_add_cred_locked(struct ucred *cred, int resource, uint64_t amount)
SDT_PROBE(racct, kernel, rusage, add__cred, cred, resource, amount,
0, 0);
racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, amount);
racct_adjust_resource(cred->cr_ruidinfo->ui_racct, resource, amount);
for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
racct_alloc_resource(pr->pr_prison_racct->prr_racct, resource,
racct_adjust_resource(pr->pr_prison_racct->prr_racct, resource,
amount);
racct_alloc_resource(cred->cr_loginclass->lc_racct, resource, amount);
racct_adjust_resource(cred->cr_loginclass->lc_racct, resource, amount);
}
/*
@ -631,7 +631,7 @@ racct_add_force(struct proc *p, int resource, uint64_t amount)
PROC_LOCK_ASSERT(p, MA_OWNED);
mtx_lock(&racct_lock);
racct_alloc_resource(p->p_racct, resource, amount);
racct_adjust_resource(p->p_racct, resource, amount);
mtx_unlock(&racct_lock);
racct_add_cred(p->p_ucred, resource, amount);
}
@ -685,7 +685,7 @@ racct_set_locked(struct proc *p, int resource, uint64_t amount)
}
}
#endif
racct_alloc_resource(p->p_racct, resource, diff_proc);
racct_adjust_resource(p->p_racct, resource, diff_proc);
if (diff_cred > 0)
racct_add_cred_locked(p->p_ucred, resource, diff_cred);
else if (diff_cred < 0)
@ -747,7 +747,7 @@ racct_set_force_locked(struct proc *p, int resource, uint64_t amount)
} else
diff_cred = diff_proc;
racct_alloc_resource(p->p_racct, resource, diff_proc);
racct_adjust_resource(p->p_racct, resource, diff_proc);
if (diff_cred > 0)
racct_add_cred_locked(p->p_ucred, resource, diff_cred);
else if (diff_cred < 0)
@ -849,7 +849,7 @@ racct_sub(struct proc *p, int resource, uint64_t amount)
"than allocated %jd for %s (pid %d)", __func__, amount, resource,
(intmax_t)p->p_racct->r_resources[resource], p->p_comm, p->p_pid));
racct_alloc_resource(p->p_racct, resource, -amount);
racct_adjust_resource(p->p_racct, resource, -amount);
racct_sub_cred_locked(p->p_ucred, resource, amount);
mtx_unlock(&racct_lock);
}
@ -870,11 +870,11 @@ racct_sub_cred_locked(struct ucred *cred, int resource, uint64_t amount)
resource));
#endif
racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, -amount);
racct_adjust_resource(cred->cr_ruidinfo->ui_racct, resource, -amount);
for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
racct_alloc_resource(pr->pr_prison_racct->prr_racct, resource,
racct_adjust_resource(pr->pr_prison_racct->prr_racct, resource,
-amount);
racct_alloc_resource(cred->cr_loginclass->lc_racct, resource, -amount);
racct_adjust_resource(cred->cr_loginclass->lc_racct, resource, -amount);
}
/*