diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-03-24 20:24:04 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-03-24 20:24:04 +0000 |
| commit | 59f40fe008f4f66b473a637491209c6601043f6d (patch) | |
| tree | 2240a490ffa6523ffe442be8803e462e80fe8931 /sys/netinet | |
| parent | c0e1e43906cd42bb1d9e032f9785d51ab588bd64 (diff) | |
| download | FreeBSD-src-59f40fe008f4f66b473a637491209c6601043f6d.zip FreeBSD-src-59f40fe008f4f66b473a637491209c6601043f6d.tar.gz | |
change inp_wlock_assert to inp_lock_assert
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in_pcb.c | 4 | ||||
| -rw-r--r-- | sys/netinet/in_pcb.h | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 08373a4..9057a6c 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1234,14 +1234,14 @@ inp_runlock(struct inpcb *inp) #ifdef INVARIANTS void -inp_wlock_assert(struct inpcb *inp) +inp_lock_assert(struct inpcb *inp) { INP_LOCK_ASSERT(inp); } void -inp_wunlock_assert(struct inpcb *inp) +inp_unlock_assert(struct inpcb *inp) { INP_UNLOCK_ASSERT(inp); diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 0227798..2bdfb4e 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -281,6 +281,7 @@ struct inpcbinfo { #define INP_LOCK_ASSERT(inp) mtx_assert(&(inp)->inp_mtx, MA_OWNED) #define INP_UNLOCK_ASSERT(inp) mtx_assert(&(inp)->inp_mtx, MA_NOTOWNED) +#ifdef _KERNEL /* * These locking functions are for inpcb consumers outside of sys/netinet, * more specifically, they were added for the benefit of TOE drivers. The @@ -292,19 +293,22 @@ void inp_rlock(struct inpcb *); void inp_runlock(struct inpcb *); #ifdef INVARIANTS -void inp_wlock_assert(struct inpcb *); -void inp_wunlock_assert(struct inpcb *); +void inp_lock_assert(struct inpcb *); +void inp_unlock_assert(struct inpcb *); #else static __inline void -inp_wlock_assert(struct inpcb *inp __unused) +inp_lock_assert(struct inpcb *inp __unused) { } static __inline void -inp_wunlock_assert(struct inpcb *inp __unused) +inp_unlock_assert(struct inpcb *inp __unused) { } + #endif +#endif /* _KERNEL */ + #define INP_INFO_LOCK_INIT(ipi, d) \ mtx_init(&(ipi)->ipi_mtx, (d), NULL, MTX_DEF | MTX_RECURSE) |
