From 4a48a5d68a706ffbfc70cd5bd53b09fabc8bb5dc Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Thu, 2 Feb 2017 03:04:30 +0300 Subject: [PATCH] net: rename pid into nsid for prepare_net_ns() PID ussualy means processs ID, but prepare_net_ns works with namespaces. travis-ci: success for Dump and restore nested network namespaces (rev4) Signed-off-by: Andrei Vagin Reviewed-by: Dmitry Safonov Signed-off-by: Pavel Emelyanov --- criu/net.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/criu/net.c b/criu/net.c index 20da55b0c..4ee6f79f1 100644 --- a/criu/net.c +++ b/criu/net.c @@ -1902,32 +1902,32 @@ int dump_net_ns(int ns_id) return ret; } -int prepare_net_ns(int pid) +int prepare_net_ns(int nsid) { int ret = 0; NetnsEntry *netns = NULL; if (!(opts.empty_ns & CLONE_NEWNET)) { - ret = restore_netns_conf(pid, &netns); + ret = restore_netns_conf(nsid, &netns); if (!ret) - ret = restore_links(pid, &netns); + ret = restore_links(nsid, &netns); if (netns) netns_entry__free_unpacked(netns, NULL); if (!ret) - ret = restore_ifaddr(pid); + ret = restore_ifaddr(nsid); if (!ret) - ret = restore_route(pid); + ret = restore_route(nsid); if (!ret) - ret = restore_rule(pid); + ret = restore_rule(nsid); if (!ret) - ret = restore_iptables(pid); + ret = restore_iptables(nsid); } if (!ret) - ret = restore_nf_ct(pid, CR_FD_NETNF_CT); + ret = restore_nf_ct(nsid, CR_FD_NETNF_CT); if (!ret) - ret = restore_nf_ct(pid, CR_FD_NETNF_EXP); + ret = restore_nf_ct(nsid, CR_FD_NETNF_EXP); close_service_fd(NS_FD_OFF);