Commit 91864f58 authored by Andrey Vagin's avatar Andrey Vagin Committed by David S. Miller

net: use net->count to check whether a netns is alive or not

The previous idea was to check whether a net namespace is in
net_exit_list or not. It doesn't work, because net->exit_list is used in
__register_pernet_operations and __unregister_pernet_operations where
all namespaces are added to a temporary list to make cleanup in a error
case, so list_empty(&net->exit_list) always returns false.
Reported-by: default avatarMantas Mikulėnas <grawity@gmail.com>
Fixes: 002d8a1a ("net: skip genenerating uevents for network namespaces that are exiting")
Signed-off-by: default avatarAndrei Vagin <avagin@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a13b2082
...@@ -953,7 +953,7 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num) ...@@ -953,7 +953,7 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)
while (--i >= new_num) { while (--i >= new_num) {
struct kobject *kobj = &dev->_rx[i].kobj; struct kobject *kobj = &dev->_rx[i].kobj;
if (!list_empty(&dev_net(dev)->exit_list)) if (!atomic_read(&dev_net(dev)->count))
kobj->uevent_suppress = 1; kobj->uevent_suppress = 1;
if (dev->sysfs_rx_queue_group) if (dev->sysfs_rx_queue_group)
sysfs_remove_group(kobj, dev->sysfs_rx_queue_group); sysfs_remove_group(kobj, dev->sysfs_rx_queue_group);
...@@ -1371,7 +1371,7 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num) ...@@ -1371,7 +1371,7 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)
while (--i >= new_num) { while (--i >= new_num) {
struct netdev_queue *queue = dev->_tx + i; struct netdev_queue *queue = dev->_tx + i;
if (!list_empty(&dev_net(dev)->exit_list)) if (!atomic_read(&dev_net(dev)->count))
queue->kobj.uevent_suppress = 1; queue->kobj.uevent_suppress = 1;
#ifdef CONFIG_BQL #ifdef CONFIG_BQL
sysfs_remove_group(&queue->kobj, &dql_group); sysfs_remove_group(&queue->kobj, &dql_group);
...@@ -1558,7 +1558,7 @@ void netdev_unregister_kobject(struct net_device *ndev) ...@@ -1558,7 +1558,7 @@ void netdev_unregister_kobject(struct net_device *ndev)
{ {
struct device *dev = &(ndev->dev); struct device *dev = &(ndev->dev);
if (!list_empty(&dev_net(ndev)->exit_list)) if (!atomic_read(&dev_net(ndev)->count))
dev_set_uevent_suppress(dev, 1); dev_set_uevent_suppress(dev, 1);
kobject_get(&dev->kobj); kobject_get(&dev->kobj);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment