summaryrefslogtreecommitdiffstats
path: root/net/tipc/core.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-01-09 15:27:09 +0800
committerDavid S. Miller <davem@davemloft.net>2015-01-12 16:24:33 -0500
commit4ac1c8d0ee9faf3a4be185cc4db1381fa0d81280 (patch)
tree361ea817ed30f0dd959ea2d87d658c8d85feebb2 /net/tipc/core.c
parente05b31f4bf8994d49322e9afb004ad479a129db0 (diff)
downloadlinux-4ac1c8d0ee9faf3a4be185cc4db1381fa0d81280.tar.gz
linux-4ac1c8d0ee9faf3a4be185cc4db1381fa0d81280.tar.bz2
linux-4ac1c8d0ee9faf3a4be185cc4db1381fa0d81280.zip
tipc: name tipc name table support net namespace
TIPC name table is used to store the mapping relationship between TIPC service name and socket port ID. When tipc supports namespace, it allows users to publish service names only owned by a certain namespace. Therefore, every namespace must have its private name table to prevent service names published to one namespace from being contaminated by other service names in another namespace. Therefore, The name table global variable (ie, nametbl) and its lock must be moved to tipc_net structure, and a parameter of namespace must be added for necessary functions so that they can obtain name table variable defined in tipc_net structure. Signed-off-by: Ying Xue <ying.xue@windriver.com> Tested-by: Tero Aho <Tero.Aho@coriant.com> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/core.c')
-rw-r--r--net/tipc/core.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c
index 23ff3caa1ce6..63cde8148aaf 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -62,12 +62,24 @@ static int __net_init tipc_init_net(struct net *net)
spin_lock_init(&tn->node_list_lock);
err = tipc_sk_rht_init(net);
+ if (err)
+ goto out_sk_rht;
+
+ err = tipc_nametbl_init(net);
+ if (err)
+ goto out_nametbl;
+ return 0;
+
+out_nametbl:
+ tipc_sk_rht_destroy(net);
+out_sk_rht:
return err;
}
static void __net_exit tipc_exit_net(struct net *net)
{
tipc_net_stop(net);
+ tipc_nametbl_stop(net);
tipc_sk_rht_destroy(net);
}
@@ -98,10 +110,6 @@ static int __init tipc_init(void)
if (err)
goto out_pernet;
- err = tipc_nametbl_init();
- if (err)
- goto out_nametbl;
-
err = tipc_netlink_start();
if (err)
goto out_netlink;
@@ -133,8 +141,6 @@ out_sysctl:
out_socket:
tipc_netlink_stop();
out_netlink:
- tipc_nametbl_stop();
-out_nametbl:
unregister_pernet_subsys(&tipc_net_ops);
out_pernet:
pr_err("Unable to start in single node mode\n");
@@ -147,7 +153,6 @@ static void __exit tipc_exit(void)
tipc_bearer_cleanup();
tipc_netlink_stop();
tipc_subscr_stop();
- tipc_nametbl_stop();
tipc_socket_stop();
tipc_unregister_sysctl();