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

Merge r204810 from head to stable/8:

Browse Source 
Remove unnecessary locking of divcbinfo lock from div_output(): this has
  not been required since FreeBSD 7.0 when the so_pcb pointer leading to inp
  was guaranteed to be stable when a valid socket reference is held (as it
  is in the output path).

  Reviewed by:	bz
  Sponsored by:	Juniper Networks

Approved by:	re (kib)
This commit is contained in:
Robert Watson 2010-06-03 08:55:45 +00:00
parent 32aa4ac70d
commit c00cb785e5
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/netinet/ip_divert.c
View File

@ -392,7 +392,6 @@ div_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sin,
struct inpcb *inp; struct inpcb *inp;
dt->info |= IPFW_IS_DIVERT | IPFW_INFO_OUT; dt->info |= IPFW_IS_DIVERT | IPFW_INFO_OUT;
INP_INFO_WLOCK(&V_divcbinfo);
inp = sotoinpcb(so); inp = sotoinpcb(so);
INP_RLOCK(inp); INP_RLOCK(inp);
/* /*
@ -403,7 +402,6 @@ div_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sin,
((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) { ((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) {
error = EINVAL; error = EINVAL;
INP_RUNLOCK(inp); INP_RUNLOCK(inp);
INP_INFO_WUNLOCK(&V_divcbinfo);
m_freem(m); m_freem(m);
} else { } else {
/* Convert fields to host order for ip_output() */ /* Convert fields to host order for ip_output() */
@ -444,7 +442,6 @@ div_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sin,
error = ENOBUFS; error = ENOBUFS;
} }
INP_RUNLOCK(inp); INP_RUNLOCK(inp);
INP_INFO_WUNLOCK(&V_divcbinfo);
if (error == ENOBUFS) { if (error == ENOBUFS) {
m_freem(m); m_freem(m);
return (error); return (error);