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

[linux-2.6.git] / drivers / parport / procfs.c

diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index afa6ac4..061097f 100644 (file)
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -33,7 +33,7 @@
 #define PARPORT_MAX_SPINTIME_VALUE 1000
 
 static int do_active_device(ctl_table *table, int write, struct file *filp,
-                     void __user *result, size_t *lenp)
+                     void __user *result, size_t *lenp, loff_t *ppos)
 {
        struct parport *port = (struct parport *)table->extra1;
        char buffer[256];
@@ -43,7 +43,7 @@ static int do_active_device(ctl_table *table, int write, struct file *filp,
        if (write)              /* can't happen anyway */
                return -EACCES;
 
-       if (filp->f_pos) {
+       if (*ppos) {
                *lenp = 0;
                return 0;
        }
@@ -63,14 +63,14 @@ static int do_active_device(ctl_table *table, int write, struct file *filp,
        else
                *lenp = len;
 
-       filp->f_pos += len;
+       *ppos += len;
 
        return copy_to_user(result, buffer, len) ? -EFAULT : 0;
 }
 
 #ifdef CONFIG_PARPORT_1284
 static int do_autoprobe(ctl_table *table, int write, struct file *filp,
-                       void __user *result, size_t *lenp)
+                       void __user *result, size_t *lenp, loff_t *ppos)
 {
        struct parport_device_info *info = table->extra2;
        const char *str;
@@ -80,7 +80,7 @@ static int do_autoprobe(ctl_table *table, int write, struct file *filp,
        if (write) /* permissions stop this */
                return -EACCES;
 
-       if (filp->f_pos) {
+       if (*ppos) {
                *lenp = 0;
                return 0;
        }
@@ -105,7 +105,7 @@ static int do_autoprobe(ctl_table *table, int write, struct file *filp,
        else
                *lenp = len;
 
-       filp->f_pos += len;
+       *ppos += len;
 
        return copy_to_user (result, buffer, len) ? -EFAULT : 0;
 }
@@ -113,13 +113,13 @@ static int do_autoprobe(ctl_table *table, int write, struct file *filp,
 
 static int do_hardware_base_addr (ctl_table *table, int write,
                                  struct file *filp, void __user *result,
-                                 size_t *lenp)
+                                 size_t *lenp, loff_t *ppos)
 {
        struct parport *port = (struct parport *)table->extra1;
        char buffer[20];
        int len = 0;
 
-       if (filp->f_pos) {
+       if (*ppos) {
                *lenp = 0;
                return 0;
        }
@@ -134,20 +134,20 @@ static int do_hardware_base_addr (ctl_table *table, int write,
        else
                *lenp = len;
 
-       filp->f_pos += len;
+       *ppos += len;
 
        return copy_to_user(result, buffer, len) ? -EFAULT : 0;
 }
 
 static int do_hardware_irq (ctl_table *table, int write,
                            struct file *filp, void __user *result,
-                           size_t *lenp)
+                           size_t *lenp, loff_t *ppos)
 {
        struct parport *port = (struct parport *)table->extra1;
        char buffer[20];
        int len = 0;
 
-       if (filp->f_pos) {
+       if (*ppos) {
                *lenp = 0;
                return 0;
        }
@@ -162,20 +162,20 @@ static int do_hardware_irq (ctl_table *table, int write,
        else
                *lenp = len;
 
-       filp->f_pos += len;
+       *ppos += len;
 
        return copy_to_user(result, buffer, len) ? -EFAULT : 0;
 }
 
 static int do_hardware_dma (ctl_table *table, int write,
                            struct file *filp, void __user *result,
-                           size_t *lenp)
+                           size_t *lenp, loff_t *ppos)
 {
        struct parport *port = (struct parport *)table->extra1;
        char buffer[20];
        int len = 0;
 
-       if (filp->f_pos) {
+       if (*ppos) {
                *lenp = 0;
                return 0;
        }
@@ -190,20 +190,20 @@ static int do_hardware_dma (ctl_table *table, int write,
        else
                *lenp = len;
 
-       filp->f_pos += len;
+       *ppos += len;
 
        return copy_to_user(result, buffer, len) ? -EFAULT : 0;
 }
 
 static int do_hardware_modes (ctl_table *table, int write,
                              struct file *filp, void __user *result,
-                             size_t *lenp)
+                             size_t *lenp, loff_t *ppos)
 {
        struct parport *port = (struct parport *)table->extra1;
        char buffer[40];
        int len = 0;
 
-       if (filp->f_pos) {
+       if (*ppos) {
                *lenp = 0;
                return 0;
        }
@@ -229,7 +229,7 @@ static int do_hardware_modes (ctl_table *table, int write,
        else
                *lenp = len;
 
-       filp->f_pos += len;
+       *ppos += len;
 
        return copy_to_user(result, buffer, len) ? -EFAULT : 0;
 }