[PATCH] namespaces: utsname: switch to using uts namespaces

Replace references to system_utsname to the per-process uts namespace
where appropriate.  This includes things like uname.

Changes: Per Eric Biederman's comments, use the per-process uts namespace
	for ELF_PLATFORM, sunrpc, and parts of net/ipv4/ipconfig.c

[jdike@addtoit.com: UML fix]
[clg@fr.ibm.com: cleanup]
[akpm@osdl.org: build fix]
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Andrey Savochkin <saw@sw.ru>
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 15 insertions, 15 deletions

diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 773a134e7fdb..a67dcbd78de4 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -106,9 +106,9 @@ void mconsole_version(struct mc_request *req)
 {
         char version[256];
 
-        sprintf(version, "%s %s %s %s %s", system_utsname.sysname,
-                system_utsname.nodename, system_utsname.release,
-                system_utsname.version, system_utsname.machine);
+        sprintf(version, "%s %s %s %s %s", utsname()->sysname,
+                utsname()->nodename, utsname()->release,
+                utsname()->version, utsname()->machine);
         mconsole_reply(req, version, 0, 0);
 }
 
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index 48cf88dd02d4..abf14aaf905f 100644
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -110,7 +110,7 @@ long sys_uname(struct old_utsname __user * name)
         if (!name)
                 return -EFAULT;
         down_read(&uts_sem);
-        err = copy_to_user(name, &system_utsname, sizeof (*name));
+        err = copy_to_user(name, utsname(), sizeof (*name));
         up_read(&uts_sem);
         return err?-EFAULT:0;
 }
@@ -126,21 +126,21 @@ long sys_olduname(struct oldold_utsname __user * name)
 
         down_read(&uts_sem);
 
-        error = __copy_to_user(&name->sysname,&system_utsname.sysname,
+        error = __copy_to_user(&name->sysname, &utsname()->sysname,
                                __OLD_UTS_LEN);
-        error |= __put_user(0,name->sysname+__OLD_UTS_LEN);
-        error |= __copy_to_user(&name->nodename,&system_utsname.nodename,
+        error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
+        error |= __copy_to_user(&name->nodename, &utsname()->nodename,
                                 __OLD_UTS_LEN);
-        error |= __put_user(0,name->nodename+__OLD_UTS_LEN);
-        error |= __copy_to_user(&name->release,&system_utsname.release,
+        error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
+        error |= __copy_to_user(&name->release, &utsname()->release,
                                 __OLD_UTS_LEN);
-        error |= __put_user(0,name->release+__OLD_UTS_LEN);
-        error |= __copy_to_user(&name->version,&system_utsname.version,
+        error |= __put_user(0, name->release + __OLD_UTS_LEN);
+        error |= __copy_to_user(&name->version, &utsname()->version,
                                 __OLD_UTS_LEN);
-        error |= __put_user(0,name->version+__OLD_UTS_LEN);
-        error |= __copy_to_user(&name->machine,&system_utsname.machine,
+        error |= __put_user(0, name->version + __OLD_UTS_LEN);
+        error |= __copy_to_user(&name->machine, &utsname()->machine,
                                 __OLD_UTS_LEN);
-        error |= __put_user(0,name->machine+__OLD_UTS_LEN);
+        error |= __put_user(0, name->machine + __OLD_UTS_LEN);
 
         up_read(&uts_sem);
 
diff --git a/arch/um/sys-x86_64/syscalls.c b/arch/um/sys-x86_64/syscalls.c
index 6fce9f45dfdc..73ce4463f70c 100644
--- a/arch/um/sys-x86_64/syscalls.c
+++ b/arch/um/sys-x86_64/syscalls.c
@@ -21,7 +21,7 @@ asmlinkage long sys_uname64(struct new_utsname __user * name)
 {
         int err;
         down_read(&uts_sem);
-        err = copy_to_user(name, &system_utsname, sizeof (*name));
+        err = copy_to_user(name, utsname(), sizeof (*name));
         up_read(&uts_sem);
         if (personality(current->personality) == PER_LINUX32)
                 err |= copy_to_user(&name->machine, "i686", 5);