[PATCH] namespaces: utsname: use init_utsname when appropriate

In some places, particularly drivers and __init code, the init utsns is the
appropriate one to use.  This patch replaces those with a the init_utsname
helper.

Changes: Removed several uses of init_utsname().  Hope I picked all the
	right ones in net/ipv4/ipconfig.c.  These are now changed to
	utsname() (the per-process namespace utsname) in the previous
	patch (2/7)

[akpm@osdl.org: CIFS 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>
Cc: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

6 files changed, 7 insertions, 7 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 37f9f5e7425..e658089f7b5 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -318,8 +318,8 @@ static int rh_string (
 
         // id 3 == vendor description
         } else if (id == 3) {
-                snprintf (buf, sizeof buf, "%s %s %s", system_utsname.sysname,
-                        system_utsname.release, hcd->driver->description);
+                snprintf (buf, sizeof buf, "%s %s %s", init_utsname()->sysname,
+                        init_utsname()->release, hcd->driver->description);
 
         // unsupported IDs --> "protocol stall"
         } else
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 366dc0a9e52..1c17d26d03b 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2260,7 +2260,7 @@ eth_bind (struct usb_gadget *gadget)
                 return -ENODEV;
         }
         snprintf (manufacturer, sizeof manufacturer, "%s %s/%s",
-                system_utsname.sysname, system_utsname.release,
+                init_utsname()->sysname, init_utsname()->release,
                 gadget->name);
 
         /* If there's an RNDIS configuration, that's what Windows wants to
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index c83d3b6c68f..8b975d15538 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -4001,7 +4001,7 @@ static int __init fsg_bind(struct usb_gadget *gadget)
         usb_gadget_set_selfpowered(gadget);
 
         snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
-                        system_utsname.sysname, system_utsname.release,
+                        init_utsname()->sysname, init_utsname()->release,
                         gadget->name);
 
         /* On a real device, serial[] would be loaded from permanent
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index b68cecd5741..83601d4009e 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -1189,7 +1189,7 @@ static int __devinit gmidi_bind(struct usb_gadget *gadget)
                 strlcpy(manufacturer, iManufacturer, sizeof(manufacturer));
         } else {
                 snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
-                        system_utsname.sysname, system_utsname.release,
+                        init_utsname()->sysname, init_utsname()->release,
                         gadget->name);
         }
         if (iProduct) {
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 489a85e58bc..208e55a667a 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -1434,7 +1434,7 @@ static int __init gs_bind(struct usb_gadget *gadget)
                 return -ENOMEM;
 
         snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
-                system_utsname.sysname, system_utsname.release,
+                init_utsname()->sysname, init_utsname()->release,
                 gadget->name);
 
         memset(dev, 0, sizeof(struct gs_dev));
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index b7018ee487e..0f809dd6849 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -1242,7 +1242,7 @@ autoconf_fail:
                 EP_OUT_NAME, EP_IN_NAME);
 
         snprintf (manufacturer, sizeof manufacturer, "%s %s with %s",
-                system_utsname.sysname, system_utsname.release,
+                init_utsname()->sysname, init_utsname()->release,
                 gadget->name);
 
         return 0;