projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
user_namespace.h
diff --git
a/include/linux/user_namespace.h
b/include/linux/user_namespace.h
index b5f41d4c2eec71a3d3c786128f0f980f0b41317d..cc4f45361dbbc8a956f9a9fad2a865dc7f4add33 100644
(file)
--- a/
include/linux/user_namespace.h
+++ b/
include/linux/user_namespace.h
@@
-12,7
+12,8
@@
struct user_namespace {
struct kref kref;
struct hlist_head uidhash_table[UIDHASH_SZ];
struct user_namespace {
struct kref kref;
struct hlist_head uidhash_table[UIDHASH_SZ];
- struct user_struct *root_user;
+ struct user_struct *creator;
+ struct work_struct destroyer;
};
extern struct user_namespace init_user_ns;
};
extern struct user_namespace init_user_ns;
@@
-26,8
+27,7
@@
static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
return 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)
extern void free_user_ns(struct kref *kref);
static inline void put_user_ns(struct user_namespace *ns)
@@
-43,13
+43,9
@@
static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
return &init_user_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)
}
static inline void put_user_ns(struct user_namespace *ns)