* [PATCH 2/2] netns bridge: cleanup bridges during netns stop
@ 2008-09-06 6:44 Alexey Dobriyan
[not found] ` <20080906064408.GB7810-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
2008-09-08 23:20 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Alexey Dobriyan @ 2008-09-06 6:44 UTC (permalink / raw)
To: davem, shemminger; +Cc: netdev, containers
Signed-off-by: Alexey Dobriyan <adobriyan@gmail•com>
---
net/bridge/br.c | 22 ++++++++++++++++------
net/bridge/br_if.c | 4 ++--
net/bridge/br_private.h | 2 +-
3 files changed, 19 insertions(+), 9 deletions(-)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -28,6 +28,10 @@ static const struct stp_proto br_stp_proto = {
.rcv = br_stp_rcv,
};
+static struct pernet_operations br_net_ops = {
+ .exit = br_net_exit,
+};
+
static int __init br_init(void)
{
int err;
@@ -42,18 +46,22 @@ static int __init br_init(void)
if (err)
goto err_out;
- err = br_netfilter_init();
+ err = register_pernet_subsys(&br_net_ops);
if (err)
goto err_out1;
- err = register_netdevice_notifier(&br_device_notifier);
+ err = br_netfilter_init();
if (err)
goto err_out2;
- err = br_netlink_init();
+ err = register_netdevice_notifier(&br_device_notifier);
if (err)
goto err_out3;
+ err = br_netlink_init();
+ if (err)
+ goto err_out4;
+
brioctl_set(br_ioctl_deviceless_stub);
br_handle_frame_hook = br_handle_frame;
@@ -61,10 +69,12 @@ static int __init br_init(void)
br_fdb_put_hook = br_fdb_put;
return 0;
-err_out3:
+err_out4:
unregister_netdevice_notifier(&br_device_notifier);
-err_out2:
+err_out3:
br_netfilter_fini();
+err_out2:
+ unregister_pernet_subsys(&br_net_ops);
err_out1:
br_fdb_fini();
err_out:
@@ -80,7 +90,7 @@ static void __exit br_deinit(void)
unregister_netdevice_notifier(&br_device_notifier);
brioctl_set(NULL);
- br_cleanup_bridges();
+ unregister_pernet_subsys(&br_net_ops);
synchronize_net();
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -446,13 +446,13 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
return 0;
}
-void __exit br_cleanup_bridges(void)
+void br_net_exit(struct net *net)
{
struct net_device *dev;
rtnl_lock();
restart:
- for_each_netdev(&init_net, dev) {
+ for_each_netdev(net, dev) {
if (dev->priv_flags & IFF_EBRIDGE) {
del_br(dev->priv);
goto restart;
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -180,7 +180,7 @@ extern void br_flood_forward(struct net_bridge *br, struct sk_buff *skb);
extern void br_port_carrier_check(struct net_bridge_port *p);
extern int br_add_bridge(struct net *net, const char *name);
extern int br_del_bridge(struct net *net, const char *name);
-extern void br_cleanup_bridges(void);
+extern void br_net_exit(struct net *net);
extern int br_add_if(struct net_bridge *br,
struct net_device *dev);
extern int br_del_if(struct net_bridge *br,
^ permalink raw reply [flat|nested] 5+ messages in thread[parent not found: <20080906064408.GB7810-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>]
* Re: [PATCH 2/2] netns bridge: cleanup bridges during netns stop
[not found] ` <20080906064408.GB7810-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
@ 2008-09-07 1:38 ` Stephen Hemminger
2008-09-07 14:08 ` Alexey Dobriyan
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Hemminger @ 2008-09-07 1:38 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
containers-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b,
davem-fT/PcQaiUtIeIZ0/mPfg9Q
On Sat, 6 Sep 2008 10:44:08 +0400
Alexey Dobriyan <adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org> wrote:
> Signed-off-by: Alexey Dobriyan <adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>
> ---
>
> net/bridge/br.c | 22 ++++++++++++++++------
> net/bridge/br_if.c | 4 ++--
> net/bridge/br_private.h | 2 +-
> 3 files changed, 19 insertions(+), 9 deletions(-)
>
> --- a/net/bridge/br.c
> +++ b/net/bridge/br.c
> @@ -28,6 +28,10 @@ static const struct stp_proto br_stp_proto = {
> .rcv = br_stp_rcv,
> };
>
> +static struct pernet_operations br_net_ops = {
> + .exit = br_net_exit,
> +};
> +
Acked-by: Stephen Hemminger <shemminger-ZtmgI6mnKB3QT0dZR+AlfA@public•gmane.org>
overall, this is fine, but you might want to think about making
pernet_operations const if possible in future.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] netns bridge: cleanup bridges during netns stop
2008-09-07 1:38 ` Stephen Hemminger
@ 2008-09-07 14:08 ` Alexey Dobriyan
0 siblings, 0 replies; 5+ messages in thread
From: Alexey Dobriyan @ 2008-09-07 14:08 UTC (permalink / raw)
To: Stephen Hemminger
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
containers-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b,
davem-fT/PcQaiUtIeIZ0/mPfg9Q
On Sat, Sep 06, 2008 at 06:38:21PM -0700, Stephen Hemminger wrote:
> overall, this is fine, but you might want to think about making
> pernet_operations const if possible in future.
pernet_operations are kept in list, so are modified.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] netns bridge: cleanup bridges during netns stop
2008-09-06 6:44 [PATCH 2/2] netns bridge: cleanup bridges during netns stop Alexey Dobriyan
[not found] ` <20080906064408.GB7810-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
@ 2008-09-08 23:20 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2008-09-08 23:20 UTC (permalink / raw)
To: adobriyan; +Cc: shemminger, netdev, containers
From: Alexey Dobriyan <adobriyan@gmail•com>
Date: Sat, 6 Sep 2008 10:44:08 +0400
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail•com>
Also applied to net-next-2.6
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] netns bridge: cleanup bridges during netns stop
@ 2008-08-21 22:18 adobriyan
0 siblings, 0 replies; 5+ messages in thread
From: adobriyan @ 2008-08-21 22:18 UTC (permalink / raw)
To: shemminger, netdev, containers
Signed-off-by: Alexey Dobriyan <adobriyan@gmail•com>
---
net/bridge/br.c | 22 ++++++++++++++++------
net/bridge/br_if.c | 4 ++--
net/bridge/br_private.h | 2 +-
3 files changed, 19 insertions(+), 9 deletions(-)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -28,6 +28,10 @@ static const struct stp_proto br_stp_proto = {
.rcv = br_stp_rcv,
};
+static struct pernet_operations br_net_ops = {
+ .exit = br_net_exit,
+};
+
static int __init br_init(void)
{
int err;
@@ -42,18 +46,22 @@ static int __init br_init(void)
if (err)
goto err_out;
- err = br_netfilter_init();
+ err = register_pernet_subsys(&br_net_ops);
if (err)
goto err_out1;
- err = register_netdevice_notifier(&br_device_notifier);
+ err = br_netfilter_init();
if (err)
goto err_out2;
- err = br_netlink_init();
+ err = register_netdevice_notifier(&br_device_notifier);
if (err)
goto err_out3;
+ err = br_netlink_init();
+ if (err)
+ goto err_out4;
+
brioctl_set(br_ioctl_deviceless_stub);
br_handle_frame_hook = br_handle_frame;
@@ -61,10 +69,12 @@ static int __init br_init(void)
br_fdb_put_hook = br_fdb_put;
return 0;
-err_out3:
+err_out4:
unregister_netdevice_notifier(&br_device_notifier);
-err_out2:
+err_out3:
br_netfilter_fini();
+err_out2:
+ unregister_pernet_subsys(&br_net_ops);
err_out1:
br_fdb_fini();
err_out:
@@ -80,7 +90,7 @@ static void __exit br_deinit(void)
unregister_netdevice_notifier(&br_device_notifier);
brioctl_set(NULL);
- br_cleanup_bridges();
+ unregister_pernet_subsys(&br_net_ops);
synchronize_net();
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -446,13 +446,13 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
return 0;
}
-void __exit br_cleanup_bridges(void)
+void br_net_exit(struct net *net)
{
struct net_device *dev;
rtnl_lock();
restart:
- for_each_netdev(&init_net, dev) {
+ for_each_netdev(net, dev) {
if (dev->priv_flags & IFF_EBRIDGE) {
del_br(dev->priv);
goto restart;
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -180,7 +180,7 @@ extern void br_flood_forward(struct net_bridge *br, struct sk_buff *skb);
extern void br_port_carrier_check(struct net_bridge_port *p);
extern int br_add_bridge(struct net *net, const char *name);
extern int br_del_bridge(struct net *net, const char *name);
-extern void br_cleanup_bridges(void);
+extern void br_net_exit(struct net *net);
extern int br_add_if(struct net_bridge *br,
struct net_device *dev);
extern int br_del_if(struct net_bridge *br,
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-09-08 23:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-06 6:44 [PATCH 2/2] netns bridge: cleanup bridges during netns stop Alexey Dobriyan
[not found] ` <20080906064408.GB7810-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
2008-09-07 1:38 ` Stephen Hemminger
2008-09-07 14:08 ` Alexey Dobriyan
2008-09-08 23:20 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2008-08-21 22:18 adobriyan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox