mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 15:25:21 +00:00
Code Issues Releases Wiki Activity

net: Use ns walking helper

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2014-10-09 17:43:03 +04:00
parent 16971e47cd
commit 2d3fa5e7d0
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
net.c
View File

@@ -684,8 +684,9 @@ err_nl:
goto out; goto out;
} }
static int collect_net_ns(struct ns_id *ns, bool for_dump) static int collect_net_ns(struct ns_id *ns, void *oarg)
{ {
bool for_dump = (oarg == (void *)1);
int ret; int ret;
pr_info("Collecting netns %d/%d\n", ns->id, ns->pid); pr_info("Collecting netns %d/%d\n", ns->id, ns->pid);
@@ -701,27 +702,8 @@ static int collect_net_ns(struct ns_id *ns, bool for_dump)
int collect_net_namespaces(bool for_dump) int collect_net_namespaces(bool for_dump)
{ {
int ret = 0; return walk_namespaces(&net_ns_desc, collect_net_ns,
struct ns_id *ns; (void *)(for_dump ? 1UL : 0));
for (ns = ns_ids; ns; ns = ns->next) {
if (!(ns->nd->cflag & CLONE_NEWNET))
continue;
if (ns->pid == getpid()) {
if ((root_ns_mask & CLONE_NEWNET))
continue;
ret = collect_net_ns(ns, for_dump);
break;
}
ret = collect_net_ns(ns, for_dump);
if (ret)
break;
}
return ret;
} }
struct ns_desc net_ns_desc = NS_DESC_ENTRY(CLONE_NEWNET, "net"); struct ns_desc net_ns_desc = NS_DESC_ENTRY(CLONE_NEWNET, "net");