Date: Mon, 16 Mar 2009 18:02:00 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/netinet in_rmx.c Message-ID: <200903161802.n2GI2I39077910@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rwatson 2009-03-16 18:02:00 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_7)
sys/netinet in_rmx.c
Log:
SVN rev 189895 on 2009-03-16 18:02:00Z by rwatson
Merge r188962 from head to stable/7:
In in_rtqkill(), assert the radix head lock, and pass RTF_RNH_LOCKED
to in_rtrequest(); the radix head lock is already acquired before
rnh_walktree is called in in_rtqtimo_one(). This avoids a recursive
acquisition that is no longer permitted in 8.x due to use of an rwlock
for the radix head lock.
Reported by: dikshie <dikshie at gmail.com>
While not strictly required in 7.x, I am merging this to keep locking as
consistent as possible in the routing code between 7.x and 8.x. Note
that because the rwlock change has not been merged, this becomes
LOCK_ASSERT rather than WLOCK_ASSERT.
Revision Changes Path
1.57.2.4 +4 -1 src/sys/netinet/in_rmx.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903161802.n2GI2I39077910>