29c29
< * $FreeBSD: head/sys/kern/kern_rctl.c 298330 2016-04-20 02:09:38Z cem $
---
> * $FreeBSD: head/sys/kern/kern_rctl.c 298414 2016-04-21 16:22:52Z trasz $
33c33
< __FBSDID("$FreeBSD: head/sys/kern/kern_rctl.c 298330 2016-04-20 02:09:38Z cem $");
---
> __FBSDID("$FreeBSD: head/sys/kern/kern_rctl.c 298414 2016-04-21 16:22:52Z trasz $");
215,216d214
< static struct rwlock rctl_lock;
< RW_SYSINIT(rctl_lock, &rctl_lock, "RCTL lock");
218,224d215
< #define RCTL_RLOCK() rw_rlock(&rctl_lock)
< #define RCTL_RUNLOCK() rw_runlock(&rctl_lock)
< #define RCTL_WLOCK() rw_wlock(&rctl_lock)
< #define RCTL_WUNLOCK() rw_wunlock(&rctl_lock)
< #define RCTL_LOCK_ASSERT() rw_assert(&rctl_lock, RA_LOCKED)
< #define RCTL_WLOCK_ASSERT() rw_assert(&rctl_lock, RA_WLOCKED)
<
240c231
< RCTL_WLOCK();
---
> RACCT_LOCK();
242c233
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
257c248
< RCTL_WLOCK();
---
> RACCT_LOCK();
259c250
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
274c265
< RCTL_WLOCK();
---
> RACCT_LOCK();
276c267
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
291c282
< RCTL_WLOCK();
---
> RACCT_LOCK();
293c284
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
343c334
< RCTL_LOCK_ASSERT();
---
> RACCT_LOCK_ASSERT();
370c361
< RCTL_LOCK_ASSERT();
---
> RACCT_LOCK_ASSERT();
392a384
> RACCT_LOCK_ASSERT();
396,397d387
< RCTL_RLOCK();
<
410,411d399
< RCTL_RUNLOCK();
<
438a427
> RACCT_LOCK_ASSERT();
443,444d431
< RCTL_RLOCK();
<
458,459d444
< RCTL_RUNLOCK();
<
519d503
<
520a505
> RACCT_LOCK_ASSERT();
522,523d506
< RCTL_RLOCK();
<
696,697d678
< RCTL_RUNLOCK();
<
716a698
> RACCT_LOCK_ASSERT();
718,719d699
< RCTL_RLOCK();
<
734,735d713
< RCTL_RUNLOCK();
<
748a727
> RACCT_LOCK_ASSERT();
750,751d728
< RCTL_RLOCK();
<
767,768d743
< RCTL_RUNLOCK();
<
776a752
>
911c887
< RCTL_WLOCK();
---
> RACCT_LOCK();
913c889
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
923c899
< RCTL_WLOCK_ASSERT();
---
> RACCT_LOCK_ASSERT();
932a909
>
949c926
< RCTL_WLOCK_ASSERT();
---
> RACCT_LOCK_ASSERT();
1420c1397
< RCTL_WLOCK();
---
> RACCT_LOCK();
1427c1404
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
1437c1414
< RCTL_WLOCK_ASSERT();
---
> RACCT_LOCK_ASSERT();
1458c1435
< RCTL_WLOCK();
---
> RACCT_LOCK();
1460c1437
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
1477c1454
< RCTL_WLOCK();
---
> RACCT_LOCK();
1481c1458
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
1612a1590
> RACCT_LOCK();
1613a1592
> RACCT_UNLOCK();
1708c1687
< RCTL_LOCK_ASSERT();
---
> RACCT_LOCK_ASSERT();
1759c1738
< RCTL_RLOCK();
---
> RACCT_LOCK();
1773c1752
< RCTL_RUNLOCK();
---
> RACCT_UNLOCK();
1860c1839
< RCTL_RLOCK();
---
> RACCT_LOCK();
1866c1845
< RCTL_RUNLOCK();
---
> RACCT_UNLOCK();
1992c1971
< RCTL_RLOCK();
---
> RACCT_LOCK();
2004c1983
< RCTL_RUNLOCK();
---
> RACCT_UNLOCK();
2022c2001
< RCTL_WLOCK();
---
> RACCT_LOCK();
2090c2069
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
2096c2075
< RCTL_WUNLOCK();
---
> RACCT_UNLOCK();
2123,2124d2101
< LIST_INIT(&child->p_racct->r_rule_links);
<
2125a2103
> RACCT_LOCK_ASSERT();
2128c2106
< RCTL_WLOCK();
---
> LIST_INIT(&child->p_racct->r_rule_links);
2157d2134
< RCTL_WUNLOCK();
2167c2144
< RCTL_WUNLOCK();
---
>
2179a2157
> RACCT_LOCK_ASSERT();
2181d2158
< RCTL_WLOCK();
2188d2164
< RCTL_WUNLOCK();