summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2011-11-15 04:29:17 +0100
committerEric W. Biederman <ebiederm@xmission.com>2012-04-08 01:55:50 +0200
commit7e6bd8fadd1216f50468f965d0308f45e5109ced (patch)
tree16357feae4c51fdbe952f71fe735664f088371fe
parentuserns: Remove unnecessary cast to struct user_struct when copying cred->user. (diff)
downloadlinux-7e6bd8fadd1216f50468f965d0308f45e5109ced.tar.xz
linux-7e6bd8fadd1216f50468f965d0308f45e5109ced.zip
cred: Add forward declaration of init_user_ns in all cases.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r--include/linux/cred.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cred.h b/include/linux/cred.h
index adadf71a7327..d12c4e475c15 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -357,11 +357,11 @@ static inline void put_cred(const struct cred *_cred)
#define current_user() (current_cred_xxx(user))
#define current_security() (current_cred_xxx(security))
+extern struct user_namespace init_user_ns;
#ifdef CONFIG_USER_NS
#define current_user_ns() (current_cred_xxx(user_ns))
#define task_user_ns(task) (task_cred_xxx((task), user_ns))
#else
-extern struct user_namespace init_user_ns;
#define current_user_ns() (&init_user_ns)
#define task_user_ns(task) (&init_user_ns)
#endif