[CRIU] [PATCH v5 16/42] pstree: Skip zombie dumping tricks if there is kdat.has_nspid
Kirill Tkhai
ktkhai at virtuozzo.com
Fri May 5 09:15:18 PDT 2017
In case of kdat.has_nspid == true, zombie pids are already
dumped.
v4: New
Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
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 e971e153d..1d661e7b1 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1119,6 +1119,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) {
@@ -1132,8 +1133,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)
More information about the CRIU
mailing list