X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Fuser_namespace.c;h=4c9006275df7fef80ae61944d39cdeea78246bb0;hb=d5a4630a0daad241c761064295958554472ed491;hp=e7ba1bf8457caed4144f2ad10e2f7a1800aec14c;hpb=735de2230f09741077a645a913de0a04b10208bf;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index e7ba1bf..4c90062 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -10,17 +10,6 @@
 #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
@@ -81,8 +70,6 @@ void free_user_ns(struct kref *kref)
 	struct user_namespace *ns;
 
 	ns = container_of(kref, struct user_namespace, kref);
-	free_uid(ns->root_user);
+	release_uids(ns);
 	kfree(ns);
 }
-
-#endif /* CONFIG_USER_NS */