[CRIU] [PATCH v2 06/11] pstree: make equal_pid handle sid comparison between nested pidnses

[Pavel Tikhomirov]

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 at virtuozzo.com>
---
 criu/include/pid.h | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/criu/include/pid.h b/criu/include/pid.h
index 72f3636..0454902 100644
--- a/criu/include/pid.h
+++ b/criu/include/pid.h
@@ -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)
 {
-- 
2.9.3