From owner-cvs-src-old@FreeBSD.ORG Fri Aug 28 20:07:47 2009 Return-Path: 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 9C44A106576B for ; Fri, 28 Aug 2009 20:07:47 +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 8A5558FC17 for ; Fri, 28 Aug 2009 20:07:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7SK7lTm065580 for ; Fri, 28 Aug 2009 20:07:47 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7SK7lkS065579 for cvs-src-old@freebsd.org; Fri, 28 Aug 2009 20:07:47 GMT (envelope-from rwatson@repoman.freebsd.org) Message-Id: <200908282007.n7SK7lkS065579@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rwatson@repoman.freebsd.org using -f From: Robert Watson Date: Fri, 28 Aug 2009 20:07:38 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sys/net if_ef.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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2009 20:07:47 -0000 rwatson 2009-08-28 20:07:38 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sys/net if_ef.c Log: SVN rev 196627 on 2009-08-28 20:07:38Z by rwatson Merge r196482 from head to stable/8: Rather than using IFNET_RLOCK() when iterating over (and modifying) the ifnet list during if_ef load, directly acquire the ifnet_sxlock exclusively. That way when if_alloc() recurses the lock, it's a write recursion rather than a read->write recursion. This code structure is arguably a bug, so add a comment indicating that this is the case. Post-8.0, we should fix this, but this commit resolves panic-on-load for if_ef. Discussed with: bz, julian Reported by: phk Approved by: re (kib) Revision Changes Path 1.49.2.2 +15 -2 src/sys/net/if_ef.c