summaryrefslogtreecommitdiff
path: root/include/linux/user_namespace.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2008-11-26 05:26:44 (GMT)
committerJames Morris <jmorris@namei.org>2008-11-26 05:26:44 (GMT)
commit3496f92beb9aa99ef21fccc154a36c7698e9c538 (patch)
tree2492602c6316b654378c3b557e206923956e59f4 /include/linux/user_namespace.h
parent200036ca9b3f0b2250912142552ce56682190f95 (diff)
parent6ded6ab9be4f6164aef1c527407c1b94f0929799 (diff)
downloadlinux-fsl-qoriq-3496f92beb9aa99ef21fccc154a36c7698e9c538.tar.xz
Merge branch 'serge-next' into next
Diffstat (limited to 'include/linux/user_namespace.h')
-rw-r--r--include/linux/user_namespace.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index b5f41d4..315bcd3 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -12,7 +12,7 @@
struct user_namespace {
struct kref kref;
struct hlist_head uidhash_table[UIDHASH_SZ];
- struct user_struct *root_user;
+ struct user_struct *creator;
};
extern struct user_namespace init_user_ns;
@@ -26,8 +26,7 @@ static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
return ns;
}
-extern struct user_namespace *copy_user_ns(int flags,
- struct user_namespace *old_ns);
+extern int create_user_ns(struct cred *new);
extern void free_user_ns(struct kref *kref);
static inline void put_user_ns(struct user_namespace *ns)
@@ -43,13 +42,9 @@ static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
return &init_user_ns;
}
-static inline struct user_namespace *copy_user_ns(int flags,
- struct user_namespace *old_ns)
+static inline int create_user_ns(struct cred *new)
{
- if (flags & CLONE_NEWUSER)
- return ERR_PTR(-EINVAL);
-
- return old_ns;
+ return -EINVAL;
}
static inline void put_user_ns(struct user_namespace *ns)