From a4644f9bd8a735f4d17fd6e323c714f72cb0c2c9 Mon Sep 17 00:00:00 2001 From: rwatson Date: Sat, 10 Jul 2004 04:38:06 +0000 Subject: Now socket buffer locks are being asserted at higher code blocks in soreceive(), remove some leaf assertions that are redundant. --- sys/kern/uipc_socket.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 8b0bc25..ae2442e 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1165,7 +1165,6 @@ dontblock: if ((flags & MSG_PEEK) == 0) { so->so_oobmark -= len; if (so->so_oobmark == 0) { - SOCKBUF_LOCK_ASSERT(&so->so_rcv); so->so_rcv.sb_state |= SBS_RCVATMARK; break; } @@ -1212,10 +1211,8 @@ dontblock: SOCKBUF_LOCK_ASSERT(&so->so_rcv); if (m != NULL && pr->pr_flags & PR_ATOMIC) { flags |= MSG_TRUNC; - if ((flags & MSG_PEEK) == 0) { - SOCKBUF_LOCK_ASSERT(&so->so_rcv); + if ((flags & MSG_PEEK) == 0) (void) sbdroprecord_locked(&so->so_rcv); - } } if ((flags & MSG_PEEK) == 0) { if (m == NULL) { -- cgit v1.1