From fec8dc4a1e1981ca897e1603037d7ab8cc4afe2d Mon Sep 17 00:00:00 2001 From: Kirill Tkhai Date: Fri, 5 May 2017 19:15:18 +0300 Subject: [PATCH] pstree: Skip zombie dumping tricks if there is kdat.has_nspid In case of kdat.has_nspid == true, zombie pids are already dumped. v4: New Signed-off-by: Kirill Tkhai Signed-off-by: Andrei Vagin --- criu/cr-dump.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/criu/cr-dump.c b/criu/cr-dump.c index 3a64990aa..bbb265005 100644 --- a/criu/cr-dump.c +++ b/criu/cr-dump.c @@ -1136,6 +1136,7 @@ static int dump_zombies(void) continue; if (vpid(item) < 0) { + BUG_ON(kdat.has_nspid); if (!pidns) vpid(item) = item->pid->real; else if (root_item == item) { @@ -1149,8 +1150,10 @@ static int dump_zombies(void) if (parse_pid_stat(vpid(item), &pps_buf) < 0) goto err; - vsid(item) = pps_buf.sid; - vpgid(item) = pps_buf.pgid; + if (!kdat.has_nspid) { + vsid(item) = pps_buf.sid; + vpgid(item) = pps_buf.pgid; + } BUG_ON(!list_empty(&item->children)); if (dump_one_zombie(item, &pps_buf) < 0)