Prev: [PATCH 00/12] Multiple file->f_pos/nonseekable_open/llseek fixes (reposy)
Next: [PATCH 09/12] osst: Use noop_llseek() instead of default_llseek()
From: Jan Blunck on 9 Apr 2010 10:10
flash_read() updates file->f_pos directly instead of the ppos given. The
VFS later updates the file->f_pos and overwrites it with the unchanged
value of ppos.

Signed-off-by: Jan Blunck <jblunck(a)suse.de>
---
drivers/sbus/char/flash.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 4108347..12cd438 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -106,9 +106,9 @@ static ssize_t
flash_read(struct file * file, char __user * buf,
size_t count, loff_t *ppos)
{
- unsigned long p = file->f_pos;
+ loff_t p = *ppos;
int i;
-
+
if (count > flash.read_size - p)
count = flash.read_size - p;

@@ -119,7 +119,7 @@ flash_read(struct file * file, char __user * buf,
buf++;
}

- file->f_pos += count;
+ *ppos += count;
return count;
}

--
1.6.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 00/12] Multiple file->f_pos/nonseekable_open/llseek fixes (reposy)
Next: [PATCH 09/12] osst: Use noop_llseek() instead of default_llseek()