diff options
| author | Kirill Tkhai <ktkhai@virtuozzo.com> | 2018-02-19 12:58:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-20 13:23:49 -0500 |
| commit | 8349efd903394422d1598d196b6be70c410cf8f5 (patch) | |
| tree | 0ebe27833d80a4162d34b6b46c8bc20db85b9dac | |
| parent | 65b7b5b90fcd17b25ef43b0cd02bda47bf286675 (diff) | |
| download | linux-stable-8349efd903394422d1598d196b6be70c410cf8f5.tar.gz linux-stable-8349efd903394422d1598d196b6be70c410cf8f5.tar.bz2 linux-stable-8349efd903394422d1598d196b6be70c410cf8f5.zip | |
net: Queue net_cleanup_work only if there is first net added
When llist_add() returns false, cleanup_net() hasn't made its
llist_del_all(), while the work has already been scheduled
by the first queuer. So, we may skip queue_work() in this case.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/net_namespace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index abf8a46e94e2..27a55236ad64 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -582,8 +582,8 @@ static DECLARE_WORK(net_cleanup_work, cleanup_net); void __put_net(struct net *net) { /* Cleanup the network namespace in process context */ - llist_add(&net->cleanup_list, &cleanup_list); - queue_work(netns_wq, &net_cleanup_work); + if (llist_add(&net->cleanup_list, &cleanup_list)) + queue_work(netns_wq, &net_cleanup_work); } EXPORT_SYMBOL_GPL(__put_net); |