Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-23 01:59:04 +00:00
Code Issues Projects Releases Wiki Activity

pstree: make equal_pid handle sid comparison between nested pidnses

Browse source 
If process belonging to some session is in different pidns than leader
of these session, it will have zeroes on all aditional levels in sid,
so though levels for these process and leader does not match - sids do.

v2: change to static inline function as there is no more pr_err
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Pavel Tikhomirov 2017-05-29 18:21:03 +03:00 • committed by Andrei Vagin
parent 6e979f6867
commit f10251e66c
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
criu/include/pid.h
View file

@ -46,21 +46,27 @@ struct pid {
} ns[1]; /* Must be at the end of struct pid */
};
#define equal_pid(a, b) \
({ \
int ___i, ___ret = true; \
if (a->level == b->level) { \
for (___i = 0; ___i < a->level; ___i++) \
if (a->ns[___i].virt != b->ns[___i].virt) { \
___ret = false; \
___i = a->level; /* break */ \
} \
} else { \
pr_err("Wrong pid nesting level\n"); \
___ret = false; \
} \
___ret; \
})
static inline bool equal_pid(struct pid *a, struct pid *b)
{
struct pid *t;
int i;
if (a->level > b->level) {
t = a;
a = b;
b = t;
}
for(i = 0; i < b->level; i++) {
if (i < a->level) {
if (a->ns[i].virt != b->ns[i].virt)
return false;
} else if (b->ns[i].virt != 0)
return false;
}
return true;
}
static inline pid_t last_level_pid(struct pid *pid)
{