netns: Delete virtual interfaces during namespace cleanup
When physical devices are inside of network namespace and that network namespace terminates we can not make them go away. We have to keep them and moving them to the initial network namespace is the best we can do. For virtual devices left in a network namespace that is exiting we have no need to preserve them and we now have the infrastructure that allows us to delete them. So delete virtual devices when we exit a network namespace. Keeping the necessary user space clean up after a network namespace exits much more tractable. Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com> Acked-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
270acefafe
commit
d0c082cea6
1 changed files with 6 additions and 0 deletions
|
@ -4852,6 +4852,12 @@ static void __net_exit default_device_exit(struct net *net)
|
||||||
if (dev->features & NETIF_F_NETNS_LOCAL)
|
if (dev->features & NETIF_F_NETNS_LOCAL)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
/* Delete virtual devices */
|
||||||
|
if (dev->rtnl_link_ops && dev->rtnl_link_ops->dellink) {
|
||||||
|
dev->rtnl_link_ops->dellink(dev);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
/* Push remaing network devices to init_net */
|
/* Push remaing network devices to init_net */
|
||||||
snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex);
|
snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex);
|
||||||
err = dev_change_net_namespace(dev, &init_net, fb_name);
|
err = dev_change_net_namespace(dev, &init_net, fb_name);
|
||||||
|
|
Loading…
Reference in a new issue