X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Futsname.c;h=8a82b4b8ea52cb3690e25bf039eaf32ff5c8c079;hb=87d5e0236d9d688fb575e9e12232764ac617617c;hp=64d398f1244436cbdc4ede981dd927e39ee708b5;hpb=1aeb272cf09f9e2cbc62163b9f37a9b4d1c7e81d;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/utsname.c b/kernel/utsname.c
index 64d398f..8a82b4b 100644
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -12,10 +12,19 @@
 #include <linux/module.h>
 #include <linux/uts.h>
 #include <linux/utsname.h>
-#include <linux/version.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 
+static struct uts_namespace *create_uts_ns(void)
+{
+	struct uts_namespace *uts_ns;
+
+	uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
+	if (uts_ns)
+		kref_init(&uts_ns->kref);
+	return uts_ns;
+}
+
 /*
  * Clone a new ns copying an original utsname, setting refcount to 1
  * @old_ns: namespace to clone
@@ -25,14 +34,13 @@ static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns)
 {
 	struct uts_namespace *ns;
 
-	ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL);
+	ns = create_uts_ns();
 	if (!ns)
 		return ERR_PTR(-ENOMEM);
 
 	down_read(&uts_sem);
 	memcpy(&ns->name, &old_ns->name, sizeof(ns->name));
 	up_read(&uts_sem);
-	kref_init(&ns->kref);
 	return ns;
 }