git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more misannotations: ne2k-pci
[sfrench/cifs-2.6.git]
/
kernel
/
user_namespace.c
diff --git
a/kernel/user_namespace.c
b/kernel/user_namespace.c
index d055d987850cc96ed2a73cc36d064b15d552dcaf..4c9006275df7fef80ae61944d39cdeea78246bb0 100644
(file)
--- a/
kernel/user_namespace.c
+++ b/
kernel/user_namespace.c
@@
-10,17
+10,6
@@
#include <linux/nsproxy.h>
#include <linux/user_namespace.h>
#include <linux/nsproxy.h>
#include <linux/user_namespace.h>
-struct user_namespace init_user_ns = {
- .kref = {
- .refcount = ATOMIC_INIT(2),
- },
- .root_user = &root_user,
-};
-
-EXPORT_SYMBOL_GPL(init_user_ns);
-
-#ifdef CONFIG_USER_NS
-
/*
* Clone a new ns copying an original user ns, setting refcount to 1
* @old_ns: namespace to clone
/*
* Clone a new ns copying an original user ns, setting refcount to 1
* @old_ns: namespace to clone
@@
-39,7
+28,7
@@
static struct user_namespace *clone_user_ns(struct user_namespace *old_ns)
kref_init(&ns->kref);
for (n = 0; n < UIDHASH_SZ; ++n)
kref_init(&ns->kref);
for (n = 0; n < UIDHASH_SZ; ++n)
- INIT_LIST_HEAD(ns->uidhash_table + n);
+ INIT_
H
LIST_HEAD(ns->uidhash_table + n);
/* Insert new root user. */
ns->root_user = alloc_uid(ns, 0);
/* Insert new root user. */
ns->root_user = alloc_uid(ns, 0);
@@
-81,7
+70,6
@@
void free_user_ns(struct kref *kref)
struct user_namespace *ns;
ns = container_of(kref, struct user_namespace, kref);
struct user_namespace *ns;
ns = container_of(kref, struct user_namespace, kref);
+ release_uids(ns);
kfree(ns);
}
kfree(ns);
}
-
-#endif /* CONFIG_USER_NS */