33c33
< __FBSDID("$FreeBSD: head/sys/kern/sys_socket.c 130480 2004-06-14 18:16:22Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/kern/sys_socket.c 130653 2004-06-17 22:48:11Z rwatson $");
133a134
> SOCK_LOCK(so);
137a139
> SOCK_UNLOCK(so);
140a143,148
> /*
> * XXXRW: This code separately acquires SOCK_LOCK(so)
> * and SOCKBUF_LOCK(&so->so_rcv) even though they are
> * the same mutex to avoid introducing the assumption
> * that they are the same.
> */
141a150
> SOCK_LOCK(so);
142a152,153
> SOCK_UNLOCK(so);
> SOCKBUF_LOCK(&so->so_rcv);
143a155,156
> SOCKBUF_UNLOCK(&so->so_rcv);
> SOCKBUF_LOCK(&so->so_snd);
144a158
> SOCKBUF_UNLOCK(&so->so_snd);
145a160
> SOCK_LOCK(so);
146a162,163
> SOCK_UNLOCK(so);
> SOCKBUF_LOCK(&so->so_rcv);
147a165,166
> SOCKBUF_UNLOCK(&so->so_rcv);
> SOCKBUF_LOCK(&so->so_snd);
148a168
> SOCKBUF_UNLOCK(&so->so_snd);