Date: Mon, 5 Jun 2006 11:33:45 +0400 From: Gleb Smirnoff <glebius@FreeBSD.org> To: John Baldwin <jhb@FreeBSD.org> 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 Message-ID: <20060605073345.GU98544@FreeBSD.org> In-Reply-To: <200606022035.k52KZdM1024927@repoman.freebsd.org> References: <200606022035.k52KZdM1024927@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060605073345.GU98544>