mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-01-23 10:16:41 +00:00
net: Use ns walking helper
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
parent
16971e47cd
commit
2d3fa5e7d0
1 changed files with 4 additions and 22 deletions
26
net.c
26
net.c
|
|
@ -684,8 +684,9 @@ err_nl:
|
|||
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;
|
||||
|
||||
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 ret = 0;
|
||||
struct ns_id *ns;
|
||||
|
||||
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;
|
||||
return walk_namespaces(&net_ns_desc, collect_net_ns,
|
||||
(void *)(for_dump ? 1UL : 0));
|
||||
}
|
||||
|
||||
struct ns_desc net_ns_desc = NS_DESC_ENTRY(CLONE_NEWNET, "net");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue