From: Jan Blunck <jblunck@suse.de>
To: Linux-Kernel Mailinglist <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Arnd Bergmann <arnd@arndb.de>, Alan Cox <alan@linux.intel.com>,
Jan Blunck <jblunck@suse.de>
Subject: [PATCH 01/12] osst: Update ppos instead of using file->f_pos
Date: Fri, 9 Apr 2010 16:00:44 +0200 [thread overview]
Message-ID: <1270821655-4368-2-git-send-email-jblunck@suse.de> (raw)
In-Reply-To: <1270821655-4368-1-git-send-email-jblunck@suse.de>
osst_read()/osst_write() modify file->f_pos directly instead of the ppos
given to them. The VFS later updates the file->f_pos and overwrites it
with the value of ppos.
Signed-off-by: Jan Blunck <jblunck@suse.de>
---
drivers/scsi/osst.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index acb8358..9dc0b9a 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -3586,7 +3586,7 @@ if (SRpnt) printk(KERN_ERR "%s:A: Not supposed to have SRpnt at line %d\n", name
if (i == (-ENOSPC)) {
transfer = STp->buffer->writing; /* FIXME -- check this logic */
if (transfer <= do_count) {
- filp->f_pos += do_count - transfer;
+ *ppos += do_count - transfer;
count -= do_count - transfer;
if (STps->drv_block >= 0) {
STps->drv_block += (do_count - transfer) / STp->block_size;
@@ -3624,7 +3624,7 @@ if (SRpnt) printk(KERN_ERR "%s:A: Not supposed to have SRpnt at line %d\n", name
goto out;
}
- filp->f_pos += do_count;
+ *ppos += do_count;
b_point += do_count;
count -= do_count;
if (STps->drv_block >= 0) {
@@ -3646,7 +3646,7 @@ if (SRpnt) printk(KERN_ERR "%s:A: Not supposed to have SRpnt at line %d\n", name
if (STps->drv_block >= 0) {
STps->drv_block += blks;
}
- filp->f_pos += count;
+ *ppos += count;
count = 0;
}
@@ -3822,7 +3822,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
}
STp->logical_blk_num += transfer / STp->block_size;
STps->drv_block += transfer / STp->block_size;
- filp->f_pos += transfer;
+ *ppos += transfer;
buf += transfer;
total += transfer;
}
--
1.6.4.2
next prev parent reply other threads:[~2010-04-09 14:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 14:00 [PATCH 00/12] Multiple file->f_pos/nonseekable_open/llseek fixes (reposy) Jan Blunck
2010-04-09 14:00 ` Jan Blunck [this message]
2010-04-09 14:00 ` [PATCH 02/12] flash_read should update ppos instead of file->f_pos Jan Blunck
2010-04-09 14:00 ` [PATCH 03/12] eeprom_read()/eeprom_write() " Jan Blunck
2010-04-09 14:00 ` [PATCH 04/12] frv: remove "struct file *" argument from sysctl ->proc_handler Jan Blunck
2010-04-09 16:23 ` Alexey Dobriyan
2010-04-12 8:11 ` Jan Blunck
2010-04-09 14:00 ` [PATCH 05/12] mISDN: Remove unnecessary test on f_pos Jan Blunck
2010-04-09 14:00 ` [PATCH 06/12] zcrypt: Use nonseekable_open() Jan Blunck
2010-04-09 14:00 ` [PATCH 07/12] rtc-m41t80: " Jan Blunck
2010-04-09 14:00 ` [PATCH 08/12] Introduce noop_llseek() Jan Blunck
2010-04-09 14:00 ` [PATCH 09/12] osst: Use noop_llseek() instead of default_llseek() Jan Blunck
2010-04-09 14:00 ` [PATCH 10/12] st: " Jan Blunck
2010-04-09 14:00 ` [PATCH 11/12] Do not fallback to default_llseek() when readdir() uses BKL Jan Blunck
2010-04-09 14:00 ` [PATCH 12/12] Documentation/filesystems/Locking: Update documentation on llseek() wrt BKL Jan Blunck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1270821655-4368-2-git-send-email-jblunck@suse.de \
--to=jblunck@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@linux.intel.com \
--cc=arnd@arndb.de \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®