summaryrefslogtreecommitdiff
path: root/net/tipc/core.h
diff options
context:
space:
mode:
authorErik Hugne <erik.hugne@gmail.com>2016-04-07 10:40:43 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-30 05:49:27 +0200
commit3f31559043087b9cd45582c2eb12d7900cedc4ed (patch)
tree2d986ffc2352b42131567b51598e48df28ba22f2 /net/tipc/core.h
parent44b3b7e068874040ca511fcd2a812b5fbcf44616 (diff)
tipc: make dist queue pernet
commit 541726abe7daca64390c2ec34e6a203145f1686d upstream. Nametable updates received from the network that cannot be applied immediately are placed on a defer queue. This queue is global to the TIPC module, which might cause problems when using TIPC in containers. To prevent nametable updates from escaping into the wrong namespace, we make the queue pernet instead. Signed-off-by: Erik Hugne <erik.hugne@gmail.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc/core.h')
-rw-r--r--net/tipc/core.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h
index 18e95a8020cd..fe3b89e9cde4 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -103,6 +103,9 @@ struct tipc_net {
spinlock_t nametbl_lock;
struct name_table *nametbl;
+ /* Name dist queue */
+ struct list_head dist_queue;
+
/* Topology subscription server */
struct tipc_server *topsrv;
atomic_t subscription_count;