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

1 files changed, 11 insertions, 11 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 0e9ba0b9d71e..c78762051da4 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -772,12 +772,12 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)
         separator[1] = 0; 
 
         memset(vol->source_rfc1001_name,0x20,15);
-        for(i=0;i < strnlen(system_utsname.nodename,15);i++) {
+        for(i=0;i < strnlen(utsname()->nodename,15);i++) {
                 /* does not have to be a perfect mapping since the field is
                 informational, only used for servers that do not support
                 port 445 and it can be overridden at mount time */
                 vol->source_rfc1001_name[i] = 
-                        toupper(system_utsname.nodename[i]);
+                        toupper(utsname()->nodename[i]);
         }
         vol->source_rfc1001_name[15] = 0;
         /* null target name indicates to use *SMBSERVR default called name
@@ -2153,7 +2153,7 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
                                   32, nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bytes_returned =
-                    cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release,
+                    cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release,
                                   32, nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bcc_ptr += 2;
@@ -2180,8 +2180,8 @@ CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses,
                 }
                 strcpy(bcc_ptr, "Linux version ");
                 bcc_ptr += strlen("Linux version ");
-                strcpy(bcc_ptr, system_utsname.release);
-                bcc_ptr += strlen(system_utsname.release) + 1;
+                strcpy(bcc_ptr, utsname()->release);
+                bcc_ptr += strlen(utsname()->release) + 1;
                 strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
                 bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;
         }
@@ -2445,7 +2445,7 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
                                   32, nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bytes_returned =
-                    cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release, 32,
+                    cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release, 32,
                                   nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bcc_ptr += 2;   /* null terminate Linux version */
@@ -2462,8 +2462,8 @@ CIFSNTLMSSPNegotiateSessSetup(unsigned int xid,
         } else {                /* ASCII */
                 strcpy(bcc_ptr, "Linux version ");
                 bcc_ptr += strlen("Linux version ");
-                strcpy(bcc_ptr, system_utsname.release);
-                bcc_ptr += strlen(system_utsname.release) + 1;
+                strcpy(bcc_ptr, utsname()->release);
+                bcc_ptr += strlen(utsname()->release) + 1;
                 strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
                 bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;
                 bcc_ptr++;      /* empty domain field */
@@ -2836,7 +2836,7 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
                                   32, nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bytes_returned =
-                    cifs_strtoUCS((__le16 *) bcc_ptr, system_utsname.release, 32,
+                    cifs_strtoUCS((__le16 *) bcc_ptr, utsname()->release, 32,
                                   nls_codepage);
                 bcc_ptr += 2 * bytes_returned;
                 bcc_ptr += 2;   /* null term version string */
@@ -2888,8 +2888,8 @@ CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses,
 
                 strcpy(bcc_ptr, "Linux version ");
                 bcc_ptr += strlen("Linux version ");
-                strcpy(bcc_ptr, system_utsname.release);
-                bcc_ptr += strlen(system_utsname.release) + 1;
+                strcpy(bcc_ptr, utsname()->release);
+                bcc_ptr += strlen(utsname()->release) + 1;
                 strcpy(bcc_ptr, CIFS_NETWORK_OPSYS);
                 bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1;
                 bcc_ptr++;      /* null domain */