[Devel] Re: [PATCH 2/3] user_ns: bugfix and cleanup

[Serge E. Hallyn]

This patch needs the following fixup:

From: Serge E. Hallyn <serue at us.ibm.com>
Subject: [PATCH 1/1] userns: fix compile warning if !CONFIG_USER_NS

previous patch updated get_user_ns() to return a struct
user_namespace, but the empty default for !CONFIG_USER_NS
did not return anything.

Signed-off-by: Serge E. Hallyn <serue at us.ibm.com>
---
 include/linux/user_namespace.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index f9d76de..53ad920 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -39,6 +39,7 @@ #else
 
 static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
 {
+	return NULL;
 }
 
 static inline int unshare_user_ns(unsigned long unshare_flags,
-- 
1.4.1

_______________________________________________
Containers mailing list
Containers at lists.osdl.org
https://lists.osdl.org/mailman/listinfo/containers