From owner-cvs-src-old@FreeBSD.ORG  Mon Mar 16 18:02:18 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7435E106566B
	for <cvs-src-old@freebsd.org>; Mon, 16 Mar 2009 18:02:18 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 60C668FC18
	for <cvs-src-old@freebsd.org>; Mon, 16 Mar 2009 18:02:18 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2GI2IaU077911
	for <cvs-src-old@freebsd.org>; Mon, 16 Mar 2009 18:02:18 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2GI2I39077910
	for cvs-src-old@freebsd.org; Mon, 16 Mar 2009 18:02:18 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <200903161802.n2GI2I39077910@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rwatson@repoman.freebsd.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 16 Mar 2009 18:02:00 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/sys/netinet in_rmx.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Mar 2009 18:02:19 -0000

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