diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-07-10 04:38:06 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-07-10 04:38:06 +0000 |
| commit | a4644f9bd8a735f4d17fd6e323c714f72cb0c2c9 (patch) | |
| tree | 9a4027006f38fae0cd2b05675b9d8268a3bdb4c0 | |
| parent | e3e0b9a4965c0ec28fea8c7758879a84127e67d2 (diff) | |
| download | FreeBSD-src-a4644f9bd8a735f4d17fd6e323c714f72cb0c2c9.zip FreeBSD-src-a4644f9bd8a735f4d17fd6e323c714f72cb0c2c9.tar.gz | |
Now socket buffer locks are being asserted at higher code blocks in
soreceive(), remove some leaf assertions that are redundant.
| -rw-r--r-- | sys/kern/uipc_socket.c | 5 |
1 files changed, 1 insertions, 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) { |
