VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / char / watchdog / softdog.c

diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
index e9f4f22..1179034 100644 (file)
--- a/drivers/char/watchdog/softdog.c
+++ b/drivers/char/watchdog/softdog.c
@@ -141,7 +141,7 @@ static int softdog_open(struct inode *inode, struct file *file)
         *      Activate timer
         */
        softdog_keepalive();
-       return 0;
+       return nonseekable_open(inode, file);
 }
 
 static int softdog_release(struct inode *inode, struct file *file)
@@ -161,12 +161,8 @@ static int softdog_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static ssize_t softdog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
+static ssize_t softdog_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
 {
-       /*  Can't seek (pwrite) on this device  */
-       if (ppos != &file->f_pos)
-               return -ESPIPE;
-
        /*
         *      Refresh the timer.
         */
@@ -194,6 +190,8 @@ static ssize_t softdog_write(struct file *file, const char *data, size_t len, lo
 static int softdog_ioctl(struct inode *inode, struct file *file,
        unsigned int cmd, unsigned long arg)
 {
+       void __user *argp = (void __user *)arg;
+       int __user *p = argp;
        int new_margin;
        static struct watchdog_info ident = {
                .options =              WDIOF_SETTIMEOUT |
@@ -206,23 +204,23 @@ static int softdog_ioctl(struct inode *inode, struct file *file,
                default:
                        return -ENOIOCTLCMD;
                case WDIOC_GETSUPPORT:
-                       return copy_to_user((struct watchdog_info *)arg, &ident,
+                       return copy_to_user(argp, &ident,
                                sizeof(ident)) ? -EFAULT : 0;
                case WDIOC_GETSTATUS:
                case WDIOC_GETBOOTSTATUS:
-                       return put_user(0,(int *)arg);
+                       return put_user(0, p);
                case WDIOC_KEEPALIVE:
                        softdog_keepalive();
                        return 0;
                case WDIOC_SETTIMEOUT:
-                       if (get_user(new_margin, (int *)arg))
+                       if (get_user(new_margin, p))
                                return -EFAULT;
                        if (softdog_set_heartbeat(new_margin))
                                return -EINVAL;
                        softdog_keepalive();
                        /* Fall */
                case WDIOC_GETTIMEOUT:
-                       return put_user(soft_margin, (int *)arg);
+                       return put_user(soft_margin, p);
        }
 }