[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>

2 files changed, 7 insertions, 7 deletions

diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index c608c947e6c3..89ac435aacc0 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -712,13 +712,13 @@ asmlinkage long sys_getdomainname(char __user *name, int len)
 
         down_read(&uts_sem);
         
-        nlen = strlen(system_utsname.domainname) + 1;
+        nlen = strlen(utsname()->domainname) + 1;
         err = -EINVAL;
         if (nlen > len)
                 goto out;
 
         err = -EFAULT;
-        if (!copy_to_user(name, system_utsname.domainname, nlen))
+        if (!copy_to_user(name, utsname()->domainname, nlen))
                 err = 0;
 
 out:
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index 87ebdf858a3a..953296b73f3f 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -439,16 +439,16 @@ asmlinkage int sunos_uname(struct sunos_utsname __user *name)
         int ret;
 
         down_read(&uts_sem);
-        ret = copy_to_user(&name->sname[0], &system_utsname.sysname[0],
+        ret = copy_to_user(&name->sname[0], &utsname()->sysname[0],
                            sizeof(name->sname) - 1);
-        ret |= copy_to_user(&name->nname[0], &system_utsname.nodename[0],
+        ret |= copy_to_user(&name->nname[0], &utsname()->nodename[0],
                             sizeof(name->nname) - 1);
         ret |= put_user('\0', &name->nname[8]);
-        ret |= copy_to_user(&name->rel[0], &system_utsname.release[0],
+        ret |= copy_to_user(&name->rel[0], &utsname()->release[0],
                             sizeof(name->rel) - 1);
-        ret |= copy_to_user(&name->ver[0], &system_utsname.version[0],
+        ret |= copy_to_user(&name->ver[0], &utsname()->version[0],
                             sizeof(name->ver) - 1);
-        ret |= copy_to_user(&name->mach[0], &system_utsname.machine[0],
+        ret |= copy_to_user(&name->mach[0], &utsname()->machine[0],
                             sizeof(name->mach) - 1);
         up_read(&uts_sem);
         return (ret ? -EFAULT : 0);