From owner-freebsd-current@FreeBSD.ORG Fri Jun 25 23:16:00 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FA5616A4CE; Fri, 25 Jun 2004 23:16:00 +0000 (GMT) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.177]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83DB143D39; Fri, 25 Jun 2004 23:15:59 +0000 (GMT) (envelope-from max@love2party.net) Received: from [212.227.126.208] (helo=mrelayng.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 1Bdzuu-0001AG-00; Sat, 26 Jun 2004 01:15:32 +0200 Received: from [217.83.2.105] (helo=donor.laier.local) by mrelayng.kundenserver.de with asmtp (TLSv1:RC4-MD5:128) (Exim 3.35 #1) id 1Bdzuu-0007tR-00; Sat, 26 Jun 2004 01:15:33 +0200 From: Max Laier To: freebsd-current@freebsd.org Date: Sat, 26 Jun 2004 01:12:44 +0200 User-Agent: KMail/1.6.2 References: <20040624192630.GA739@gothmog.gr> In-Reply-To: <20040624192630.GA739@gothmog.gr> MIME-Version: 1.0 Message-Id: <200406260112.53490.max@love2party.net> Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Boundary-02=_1FL3AeakW8a7m0K"; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Provags-ID: kundenserver.de abuse@kundenserver.de auth:61c499deaeeba3ba5be80f48ecc83056 cc: Giorgos Keramidas cc: darrenr@freebsd.org Subject: Re: FIX: today's ipfilter "mutex not locked" panic X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 23:16:00 -0000 --Boundary-02=_1FL3AeakW8a7m0K Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thursday 24 June 2004 21:26, Giorgos Keramidas wrote: > FWIW, > > I've locally fixed the panics that some people mentioned today for > ipfilter with the following minor diff. Now I can enable ipfilter > at boot time and still boot without panics. > > --- patch begins --- > Index: sys/contrib/ipfilter/netinet/fil.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/fil.c,v > retrieving revision 1.38 > diff -u -r1.38 fil.c > --- sys/contrib/ipfilter/netinet/fil.c 21 Jun 2004 22:46:35 -0000 1.38 > +++ sys/contrib/ipfilter/netinet/fil.c 24 Jun 2004 19:17:33 -0000 > @@ -2155,9 +2155,6 @@ > ip_natsync(ifp); > ip_statesync(ifp); > } > -# if defined(__FreeBSD_version) && (__FreeBSD_version >=3D 500043) > - IFNET_RUNLOCK(); > -# endif > ip_natsync((struct ifnet *)-1); > # if defined(__FreeBSD_version) && (__FreeBSD_version >=3D 500043) > IFNET_RUNLOCK(); > --- patch ends --- The patch is right, looks like merge mess w/ rev. 1.33 to me. Darren (CC'ed= )=20 can you commit this? =2D-=20 Best regards, | mlaier@freebsd.org Max Laier | ICQ #67774661 http://pf4freebsd.love2party.net/ | mlaier@EFnet --Boundary-02=_1FL3AeakW8a7m0K Content-Type: application/pgp-signature Content-Description: signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQBA3LF1XyyEoT62BG0RAvxGAJ9zCW4sn+tXzWoFlgeV6zO86B6GegCfRKMe 5thPz4U5UIpzogtSvCumuZY= =seia -----END PGP SIGNATURE----- --Boundary-02=_1FL3AeakW8a7m0K--