14 files changed, 71 insertions, 82 deletions

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 83bf15a3dda8..2c898c4d6b6a 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -8,6 +8,7 @@
 #include "chan_kern.h"
 #include "irq_kern.h"
 #include "irq_user.h"
+#include "kern_util.h"
 #include "os.h"
 
 #define LINE_BUFSIZE 4096
@@ -48,7 +49,7 @@ static int write_room(struct line *line)
         n = line->head - line->tail;
 
         if (n <= 0)
-                n = LINE_BUFSIZE + n; /* The other case */
+                n += LINE_BUFSIZE; /* The other case */
         return n - 1;
 }
 
@@ -58,17 +59,10 @@ int line_write_room(struct tty_struct *tty)
         unsigned long flags;
         int room;
 
-        if (tty->stopped)
-                return 0;
-
         spin_lock_irqsave(&line->lock, flags);
         room = write_room(line);
         spin_unlock_irqrestore(&line->lock, flags);
 
-        /*XXX: Warning to remove */
-        if (0 == room)
-                printk(KERN_DEBUG "%s: %s: no room left in buffer\n",
-                       __FUNCTION__,tty->name);
         return room;
 }
 
@@ -79,8 +73,7 @@ int line_chars_in_buffer(struct tty_struct *tty)
         int ret;
 
         spin_lock_irqsave(&line->lock, flags);
-
-        /*write_room subtracts 1 for the needed NULL, so we readd it.*/
+        /* write_room subtracts 1 for the needed NULL, so we readd it.*/
         ret = LINE_BUFSIZE - (write_room(line) + 1);
         spin_unlock_irqrestore(&line->lock, flags);
 
@@ -184,10 +177,6 @@ void line_flush_buffer(struct tty_struct *tty)
         unsigned long flags;
         int err;
 
-        /*XXX: copied from line_write, verify if it is correct!*/
-        if (tty->stopped)
-                return;
-
         spin_lock_irqsave(&line->lock, flags);
         err = flush_buffer(line);
         spin_unlock_irqrestore(&line->lock, flags);
@@ -213,9 +202,6 @@ int line_write(struct tty_struct *tty, const unsigned char *buf, int len)
         unsigned long flags;
         int n, ret = 0;
 
-        if (tty->stopped)
-                return 0;
-
         spin_lock_irqsave(&line->lock, flags);
         if (line->head != line->tail)
                 ret = buffer_data(line, buf, len);
@@ -788,9 +774,11 @@ static irqreturn_t winch_interrupt(int irq, void *data)
         tty = winch->tty;
         if (tty != NULL) {
                 line = tty->driver_data;
-                chan_window_size(&line->chan_list, &tty->winsize.ws_row,
-                                 &tty->winsize.ws_col);
-                kill_pgrp(tty->pgrp, SIGWINCH, 1);
+                if (line != NULL) {
+                        chan_window_size(&line->chan_list, &tty->winsize.ws_row,
+                                         &tty->winsize.ws_col);
+                        kill_pgrp(tty->pgrp, SIGWINCH, 1);
+                }
         }
  out:
         if (winch->fd != -1)
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 0f3c7d14a6e3..ebb265c07e4d 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -1,23 +1,25 @@
 /*
  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
- * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Copyright (C) 2001 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/console.h"
-#include "linux/ctype.h"
-#include "linux/interrupt.h"
-#include "linux/list.h"
-#include "linux/mm.h"
-#include "linux/module.h"
-#include "linux/notifier.h"
-#include "linux/reboot.h"
-#include "linux/proc_fs.h"
-#include "linux/slab.h"
-#include "linux/syscalls.h"
-#include "linux/utsname.h"
-#include "linux/workqueue.h"
-#include "asm/uaccess.h"
+#include <linux/console.h>
+#include <linux/ctype.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/notifier.h>
+#include <linux/reboot.h>
+#include <linux/proc_fs.h>
+#include <linux/slab.h>
+#include <linux/syscalls.h>
+#include <linux/utsname.h>
+#include <linux/workqueue.h>
+#include <linux/mutex.h>
+#include <asm/uaccess.h>
+
 #include "init.h"
 #include "irq_kern.h"
 #include "irq_user.h"
@@ -305,7 +307,9 @@ void mconsole_stop(struct mc_request *req)
         deactivate_fd(req->originating_fd, MCONSOLE_IRQ);
         os_set_fd_block(req->originating_fd, 1);
         mconsole_reply(req, "stopped", 0, 0);
-        while (mconsole_get_request(req->originating_fd, req)) {
+        for (;;) {
+                if (!mconsole_get_request(req->originating_fd, req))
+                        continue;
                 if (req->cmd->handler == mconsole_go)
                         break;
                 if (req->cmd->handler == mconsole_stop) {
@@ -358,7 +362,7 @@ struct unplugged_pages {
         void *pages[UNPLUGGED_PER_PAGE];
 };
 
-static DECLARE_MUTEX(plug_mem_mutex);
+static DEFINE_MUTEX(plug_mem_mutex);
 static unsigned long long unplugged_pages_count = 0;
 static LIST_HEAD(unplugged_pages);
 static int unplug_index = UNPLUGGED_PER_PAGE;
@@ -394,7 +398,7 @@ static int mem_config(char *str, char **error_out)
 
         diff /= PAGE_SIZE;
 
-        down(&plug_mem_mutex);
+        mutex_lock(&plug_mem_mutex);
         for (i = 0; i < diff; i++) {
                 struct unplugged_pages *unplugged;
                 void *addr;
@@ -451,7 +455,7 @@ static int mem_config(char *str, char **error_out)
 
         err = 0;
 out_unlock:
-        up(&plug_mem_mutex);
+        mutex_unlock(&plug_mem_mutex);
 out:
         return err;
 }
@@ -741,7 +745,6 @@ void mconsole_stack(struct mc_request *req)
 {
         char *ptr = req->request.data;
         int pid_requested= -1;
-        struct task_struct *from = NULL;
         struct task_struct *to = NULL;
 
         /*
@@ -763,9 +766,7 @@ void mconsole_stack(struct mc_request *req)
                 return;
         }
 
-        from = current;
-
-        to = find_task_by_pid(pid_requested);
+        to = find_task_by_pid_ns(pid_requested, &init_pid_ns);
         if ((to == NULL) || (pid_requested == 0)) {
                 mconsole_reply(req, "Couldn't find that pid", 1, 0);
                 return;
@@ -795,6 +796,8 @@ static int __init mconsole_init(void)
                 printk(KERN_ERR "Failed to initialize management console\n");
                 return 1;
         }
+        if (os_set_fd_block(sock, 0))
+                goto out;
 
         register_reboot_notifier(&reboot_notifier);
 
@@ -803,7 +806,7 @@ static int __init mconsole_init(void)
                              "mconsole", (void *)sock);
         if (err) {
                 printk(KERN_ERR "Failed to get IRQ for management console\n");
-                return 1;
+                goto out;
         }
 
         if (notify_socket != NULL) {
@@ -819,6 +822,10 @@ static int __init mconsole_init(void)
         printk(KERN_INFO "mconsole (version %d) initialized on %s\n",
                MCONSOLE_VERSION, mconsole_socket_name);
         return 0;
+
+ out:
+        os_close_file(sock);
+        return 1;
 }
 
 __initcall(mconsole_init);
diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
index 430c024a19b0..13af2f03ed84 100644
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
@@ -83,9 +83,8 @@ int mconsole_get_request(int fd, struct mc_request *req)
         int len;
 
         req->originlen = sizeof(req->origin);
-        req->len = recvfrom(fd, &req->request, sizeof(req->request),
-                            MSG_DONTWAIT, (struct sockaddr *) req->origin,
-                            &req->originlen);
+        req->len = recvfrom(fd, &req->request, sizeof(req->request), 0,
+                            (struct sockaddr *) req->origin, &req->originlen);
         if (req->len < 0)
                 return 0;
 
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 3c6c44ca1ffa..1e8f41a99511 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -318,7 +318,7 @@ static void setup_etheraddr(char *str, unsigned char *addr, char *name)
         if (str == NULL)
                 goto random;
 
-        for (i = 0;i < 6; i++) {
+        for (i = 0; i < 6; i++) {
                 addr[i] = simple_strtoul(str, &end, 16);
                 if ((end == str) ||
                    ((*end != ':') && (*end != ',') && (*end != '\0'))) {
@@ -343,14 +343,13 @@ static void setup_etheraddr(char *str, unsigned char *addr, char *name)
         }
         if (!is_local_ether_addr(addr)) {
                 printk(KERN_WARNING
-                       "Warning: attempt to assign a globally valid ethernet "
+                       "Warning: Assigning a globally valid ethernet "
                        "address to a device\n");
-                printk(KERN_WARNING "You should better enable the 2nd "
-                       "rightmost bit in the first byte of the MAC,\n");
+                printk(KERN_WARNING "You should set the 2nd rightmost bit in "
+                       "the first byte of the MAC,\n");
                 printk(KERN_WARNING "i.e. %02x:%02x:%02x:%02x:%02x:%02x\n",
                        addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4],
                        addr[5]);
-                goto random;
         }
         return;
 
@@ -368,7 +367,6 @@ static struct platform_driver uml_net_driver = {
                 .name  = DRIVER_NAME,
         },
 };
-static int driver_registered;
 
 static void net_device_release(struct device *dev)
 {
@@ -383,6 +381,12 @@ static void net_device_release(struct device *dev)
         free_netdev(netdev);
 }
 
+/*
+ * Ensures that platform_driver_register is called only once by
+ * eth_configure.  Will be set in an initcall.
+ */
+static int driver_registered;
+
 static void eth_configure(int n, void *init, char *mac,
                           struct transport *transport)
 {
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 29185cad9fff..abf2653f5517 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -201,7 +201,7 @@ static int change_tramp(char **argv, char *output, int output_len)
         close(fds[1]);
 
         if (pid > 0)
-                helper_wait(pid, 0, "change_tramp");
+                helper_wait(pid);
         return pid;
 }
 
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index 330543b3129b..19930081d3d8 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -6,6 +6,7 @@
 #include "linux/completion.h"
 #include "linux/interrupt.h"
 #include "linux/list.h"
+#include "linux/mutex.h"
 #include "asm/atomic.h"
 #include "init.h"
 #include "irq_kern.h"
@@ -120,7 +121,7 @@ static int port_accept(struct port_list *port)
         return 0;
 }
 
-static DECLARE_MUTEX(ports_sem);
+static DEFINE_MUTEX(ports_mutex);
 static LIST_HEAD(ports);
 
 static void port_work_proc(struct work_struct *unused)
@@ -161,7 +162,7 @@ void *port_data(int port_num)
         struct port_dev *dev = NULL;
         int fd;
 
-        down(&ports_sem);
+        mutex_lock(&ports_mutex);
         list_for_each(ele, &ports) {
                 port = list_entry(ele, struct port_list, list);
                 if (port->port == port_num)
@@ -216,7 +217,7 @@ void *port_data(int port_num)
  out_free:
         kfree(port);
  out:
-        up(&ports_sem);
+        mutex_unlock(&ports_mutex);
         return dev;
 }
 
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index e942e836f995..71f0959c1535 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -5,6 +5,7 @@
  * This software may be used and distributed according to the terms
  * of the GNU General Public License, incorporated herein by reference.
  */
+#include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index b8711e50da80..8b80505a3fb0 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -109,7 +109,7 @@ static int slip_tramp(char **argv, int fd)
         read_output(fds[0], output, output_len);
         printk("%s", output);
 
-        err = helper_wait(pid, 0, argv[0]);
+        err = helper_wait(pid);
         close(fds[0]);
 
 out_free:
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index 89c1be225fda..a0ada8fec72a 100644
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -98,7 +98,7 @@ static void slirp_close(int fd, void *data)
                        "(%d)\n", pri->pid, errno);
         }
 #endif
-        err = helper_wait(pri->pid, 1, "slirp_close");
+        err = helper_wait(pri->pid);
         if (err < 0)
                 return;
 
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index 875d60d0c6a2..f1786e64607f 100644
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
@@ -15,7 +15,6 @@
 #include "line.h"
 #include "ssl.h"
 #include "chan_kern.h"
-#include "kern_util.h"
 #include "kern.h"
 #include "init.h"
 #include "irq_user.h"
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 656036e90b19..cec0c33cdd39 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -22,7 +22,6 @@
 #include "stdio_console.h"
 #include "line.h"
 #include "chan_kern.h"
-#include "kern_util.h"
 #include "irq_user.h"
 #include "mconsole_kern.h"
 #include "init.h"
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 99f9f9605e9c..be3a2797dac4 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -49,6 +49,7 @@
 #include "irq_user.h"
 #include "irq_kern.h"
 #include "ubd_user.h"
+#include "kern_util.h"
 #include "os.h"
 #include "mem.h"
 #include "mem_kern.h"
@@ -229,7 +230,7 @@ static int proc_ide_read_media(char *page, char **start, off_t off, int count,
         return len;
 }
 
-static void make_ide_entries(char *dev_name)
+static void make_ide_entries(const char *dev_name)
 {
         struct proc_dir_entry *dir, *ent;
         char name[64];
@@ -244,7 +245,7 @@ static void make_ide_entries(char *dev_name)
         ent->data = NULL;
         ent->read_proc = proc_ide_read_media;
         ent->write_proc = NULL;
-        sprintf(name,"ide0/%s", dev_name);
+        snprintf(name, sizeof(name), "ide0/%s", dev_name);
         proc_symlink(dev_name, proc_ide_root, name);
 }
 
@@ -437,7 +438,10 @@ __uml_help(ubd_setup,
 "    machine by running 'dd' on the device. <n> must be in the range\n"
 "    0 to 7. Appending an 'r' to the number will cause that device\n"
 "    to be mounted read-only. For example ubd1r=./ext_fs. Appending\n"
-"    an 's' will cause data to be written to disk on the host immediately.\n\n"
+"    an 's' will cause data to be written to disk on the host immediately.\n"
+"    'c' will cause the device to be treated as being shared between multiple\n"
+"    UMLs and file locking will be turned off - this is appropriate for a\n"
+"    cluster filesystem and inappropriate at almost all other times.\n\n"
 );
 
 static int udb_setup(char *str)
@@ -456,20 +460,6 @@ __uml_help(udb_setup,
 "    in the boot output.\n\n"
 );
 
-static int fakehd_set = 0;
-static int fakehd(char *str)
-{
-        printk(KERN_INFO "fakehd : Changing ubd name to \"hd\".\n");
-        fakehd_set = 1;
-        return 1;
-}
-
-__setup("fakehd", fakehd);
-__uml_help(fakehd,
-"fakehd\n"
-"    Change the ubd device name to \"hd\".\n\n"
-);
-
 static void do_ubd_request(struct request_queue * q);
 
 /* Only changed by ubd_init, which is an initcall. */
@@ -718,8 +708,10 @@ static int ubd_add(int n, char **error_out)
                 ubd_disk_register(fake_major, ubd_dev->size, n,
                                   &fake_gendisk[n]);
 
-        /* perhaps this should also be under the "if (fake_major)" above */
-        /* using the fake_disk->disk_name and also the fakehd_set name */
+        /*
+         * Perhaps this should also be under the "if (fake_major)" above
+         * using the fake_disk->disk_name
+         */
         if (fake_ide)
                 make_ide_entries(ubd_gendisk[n]->disk_name);
 
diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
index 48fc7452bc1d..b591bb9c41dd 100644
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
@@ -16,7 +16,6 @@
 #include <sys/mman.h>
 #include <sys/param.h>
 #include "asm/types.h"
-#include "kern_util.h"
 #include "user.h"
 #include "ubd_user.h"
 #include "os.h"
diff --git a/arch/um/drivers/vde_user.c b/arch/um/drivers/vde_user.c
index d9941fe5f931..56533db25343 100644
--- a/arch/um/drivers/vde_user.c
+++ b/arch/um/drivers/vde_user.c
@@ -80,7 +80,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
 
         vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
         if (vpri->args == NULL) {
-                printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args"
+                printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
                        "allocation failed");
                 return;
         }