d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "Unlocked read" annotations associated with previously unlocked

Browse Source 
use of socket buffer fields in the TCP input code.  These references
are now protected by use of the receive socket buffer lock.

MFC after:	1 week
This commit is contained in:
rwatson 2004-11-22 13:16:27 +00:00
parent a4b5efda6e
commit ec333e6577
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/netinet/tcp_input.c
View File

@ -364,7 +364,6 @@ tcp_reass(tp, th, tlenp, m)
flags = q->tqe_th->th_flags & TH_FIN;
nq = LIST_NEXT(q, tqe_q);
LIST_REMOVE(q, tqe_q);
/* Unlocked read. */
if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
m_freem(q->tqe_m);
else
@ -1269,7 +1268,6 @@ tcp_input(m, off0)
#endif
* Add data to socket buffer.
*/
/* Unlocked read. */
SOCKBUF_LOCK(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
m_freem(m);
@ -2283,7 +2281,6 @@ tcp_input(m, off0)
tcpstat.tcps_rcvpack++;
tcpstat.tcps_rcvbyte += tlen;
ND6_HINT(tp);
/* Unlocked read. */
SOCKBUF_LOCK(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
m_freem(m);

3
sys/netinet/tcp_reass.c
View File

@ -364,7 +364,6 @@ tcp_reass(tp, th, tlenp, m)
flags = q->tqe_th->th_flags & TH_FIN;
nq = LIST_NEXT(q, tqe_q);
LIST_REMOVE(q, tqe_q);
/* Unlocked read. */
if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
m_freem(q->tqe_m);
else
@ -1269,7 +1268,6 @@ tcp_input(m, off0)
#endif
* Add data to socket buffer.
*/
/* Unlocked read. */
SOCKBUF_LOCK(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
m_freem(m);
@ -2283,7 +2281,6 @@ tcp_input(m, off0)
tcpstat.tcps_rcvpack++;
tcpstat.tcps_rcvbyte += tlen;
ND6_HINT(tp);
/* Unlocked read. */
SOCKBUF_LOCK(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
m_freem(m);