From 6d7a813c1be6afad7fa479635fc36005e748bd24 Mon Sep 17 00:00:00 2001
From: Pavel Emelianov <xemul@openvz.org>
Date: Thu, 18 Oct 2007 23:39:47 -0700
Subject: [PATCH] --- yaml --- r: 71425 b: refs/heads/master c:
 a05f7b15deb2903d9f0b5df33ddd4d186d5ecac1 h: refs/heads/master i:   71423:
 a710eead3e4a1db4396808cb73ebd33d27d7f1a9 v: v3

---
 [refs]                              | 2 +-
 trunk/include/linux/pid_namespace.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 62f75ad9d56a..ec30baa6cf68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a47afb0f9d794d525a372c8d69902147cc88222a
+refs/heads/master: a05f7b15deb2903d9f0b5df33ddd4d186d5ecac1
diff --git a/trunk/include/linux/pid_namespace.h b/trunk/include/linux/pid_namespace.h
index b9a17e08ff0f..ddb9a4c95968 100644
--- a/trunk/include/linux/pid_namespace.h
+++ b/trunk/include/linux/pid_namespace.h
@@ -24,9 +24,10 @@ struct pid_namespace {
 
 extern struct pid_namespace init_pid_ns;
 
-static inline void get_pid_ns(struct pid_namespace *ns)
+static inline struct pid_namespace *get_pid_ns(struct pid_namespace *ns)
 {
 	kref_get(&ns->kref);
+	return ns;
 }
 
 extern struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *ns);