Author: rwatson
Date: Tue Jun 1 14:18:44 2010
New Revision: 208698
URL: http://svn.freebsd.org/changeset/base/208698
Log:
Merge r204806 from head to stable/8:
Wrap use of rw_try_upgrade() on pcbinfo with macro INP_INFO_TRY_UPGRADE()
to match other pcbinfo locking macros.
Approved by: re (bz)
Modified:
stable/8/sys/netinet/in_pcb.h
stable/8/sys/netinet/tcp_input.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/netinet/in_pcb.h
==============================================================================
--- stable/8/sys/netinet/in_pcb.h Tue Jun 1 14:17:08 2010
(r208697)
+++ stable/8/sys/netinet/in_pcb.h Tue Jun 1 14:18:44 2010
(r208698)
@@ -376,6 +376,7 @@ void inp_4tuple_get(struct inpcb *inp,
#define INP_INFO_WLOCK(ipi) rw_wlock(&(ipi)->ipi_lock)
#define INP_INFO_TRY_RLOCK(ipi) rw_try_rlock(&(ipi)->ipi_lock)
#define INP_INFO_TRY_WLOCK(ipi) rw_try_wlock(&(ipi)->ipi_lock)
+#define INP_INFO_TRY_UPGRADE(ipi) rw_try_upgrade(&(ipi)->ipi_lock)
#define INP_INFO_RUNLOCK(ipi) rw_runlock(&(ipi)->ipi_lock)
#define INP_INFO_WUNLOCK(ipi) rw_wunlock(&(ipi)->ipi_lock)
#define INP_INFO_LOCK_ASSERT(ipi) rw_assert(&(ipi)->ipi_lock,
RA_LOCKED)
Modified: stable/8/sys/netinet/tcp_input.c
==============================================================================
--- stable/8/sys/netinet/tcp_input.c Tue Jun 1 14:17:08 2010
(r208697)
+++ stable/8/sys/netinet/tcp_input.c Tue Jun 1 14:18:44 2010
(r208698)
@@ -641,7 +641,7 @@ relocked:
("%s: INP_TIMEWAIT ti_locked %d", __func__, ti_locked));
if (ti_locked == TI_RLOCKED) {
- if (rw_try_upgrade(&V_tcbinfo.ipi_lock) == 0) {
+ if (INP_INFO_TRY_UPGRADE(&V_tcbinfo) == 0) {
in_pcbref(inp);
INP_WUNLOCK(inp);
INP_INFO_RUNLOCK(&V_tcbinfo);
@@ -692,7 +692,7 @@ relocked:
("%s: upgrade check ti_locked %d", __func__, ti_locked));
if (ti_locked == TI_RLOCKED) {
- if (rw_try_upgrade(&V_tcbinfo.ipi_lock) == 0) {
+ if (INP_INFO_TRY_UPGRADE(&V_tcbinfo) == 0) {
in_pcbref(inp);
INP_WUNLOCK(inp);
INP_INFO_RUNLOCK(&V_tcbinfo);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
