From owner-cvs-src@FreeBSD.ORG Mon Jun 5 07:33:48 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 8C28216A41F;
Mon, 5 Jun 2006 07:33:48 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.sick.ru (cell.sick.ru [217.72.144.68])
by mx1.FreeBSD.org (Postfix) with ESMTP id D6B8E43D45;
Mon, 5 Jun 2006 07:33:47 +0000 (GMT)
(envelope-from glebius@FreeBSD.org)
Received: from cell.sick.ru (glebius@localhost [127.0.0.1])
by cell.sick.ru (8.13.4/8.13.3) with ESMTP id k557Xj3q023726
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
Mon, 5 Jun 2006 11:33:46 +0400 (MSD)
(envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by cell.sick.ru (8.13.4/8.13.1/Submit) id k557Xjl9023725;
Mon, 5 Jun 2006 11:33:45 +0400 (MSD)
(envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.sick.ru: glebius set sender to
glebius@FreeBSD.org using -f
Date: Mon, 5 Jun 2006 11:33:45 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: John Baldwin <jhb@FreeBSD.org>
Message-ID: <20060605073345.GU98544@FreeBSD.org>
References: <200606022035.k52KZdM1024927@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <200606022035.k52KZdM1024927@repoman.freebsd.org>
User-Agent: Mutt/1.5.6i
Cc: sekes <gexlie@gmail.com>, src-committers@FreeBSD.org, julian@FreeBSD.org,
cvs-all@FreeBSD.org, cvs-src@FreeBSD.org
Subject: Re: cvs commit: src/sys/netgraph ng_base.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jun 2006 07:33:48 -0000
On Fri, Jun 02, 2006 at 08:35:39PM +0000, John Baldwin wrote:
J> jhb 2006-06-02 20:35:39 UTC
J>
J> FreeBSD src repository
J>
J> Modified files:
J> sys/netgraph ng_base.c
J> Log:
J> Conditionally acquire Giant in netgraph callouts to honor mpsafenet=0.
J>
J> Reported by: sekes <gexlie at gmail dot com>
J> MFC after: 1 week
J>
J> Revision Changes Path
J> 1.123 +2 -0 src/sys/netgraph/ng_base.c
I don't think this is best way to fix this. I'd suggest to back this
out and make this change:
Index: netgraph.h
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/netgraph.h,v
retrieving revision 1.65
diff -u -r1.65 netgraph.h
--- netgraph.h 12 Jan 2006 22:44:04 -0000 1.65
+++ netgraph.h 5 Jun 2006 07:32:43 -0000
@@ -1101,7 +1101,7 @@
int ng_uncallout(struct callout *c, node_p node);
int ng_callout(struct callout *c, node_p node, hook_p hook, int ticks,
ng_item_fn *fn, void * arg1, int arg2);
-#define ng_callout_init(c) callout_init(c, CALLOUT_MPSAFE)
+#define ng_callout_init(c) callout_init(c, NET_CALLOUT_MPSAFE)
/* Flags for netgraph functions. */
#define NG_NOFLAGS 0x00000000 /* no special options */
If you don't object, I can backout and commit the above myself.
--
Totus tuus, Glebius.
GLEBIUS-RIPN GLEB-RIPE