From: Jan Blunck <jblunck@suse.de>
To: linux-fsdevel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: "Linux-Kernel Mailinglist" <linux-kernel@vger.kernel.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
jkacur@redhat.com, "Arnd Bergmann" <arnd@arndb.de>,
"Frédéric Weisbecker" <fweisbec@gmail.com>,
"Jamie Lokier" <jamie@shareable.org>,
"Jan Blunck" <jblunck@suse.de>, "Willem Riede" <osst@riede.org>,
"James E.J. Bottomley" <James.Bottomley@suse.de>
Subject: [PATCH 03/15] osst: Update ppos instead of using file->f_pos
Date: Fri, 20 Nov 2009 17:40:33 +0100 [thread overview]
Message-ID: <1258735245-25826-4-git-send-email-jblunck@suse.de> (raw)
In-Reply-To: <1258735245-25826-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 761ca9d..960e39c 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:[~2009-11-20 16:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-20 16:40 [PATCH 00/15] Remove BKL from default_llseek() and other issues (v2) Jan Blunck
2009-11-20 16:40 ` [PATCH 01/15] Introduce noop_llseek() Jan Blunck
2009-11-20 17:05 ` Jamie Lokier
2009-11-20 17:11 ` Jan Blunck
2009-11-21 16:56 ` Arnd Bergmann
2009-11-20 16:40 ` [PATCH 02/15] osst: Use noop_llseek() instead of default_llseek() Jan Blunck
2009-11-20 17:09 ` Jamie Lokier
2009-11-20 17:25 ` Jan Blunck
2009-11-20 16:40 ` Jan Blunck [this message]
2009-11-20 17:13 ` [PATCH 03/15] osst: Update ppos instead of using file->f_pos Jamie Lokier
2009-11-20 17:16 ` Jamie Lokier
2009-11-20 16:40 ` [PATCH 04/15] s390: tape_char should update " Jan Blunck
2009-11-20 16:40 ` [PATCH 05/15] flash_read should update ppos instead of file->f_pos Jan Blunck
2009-11-20 16:40 ` [PATCH 06/15] eeprom_read()/eeprom_write() " Jan Blunck
2009-11-20 16:40 ` [PATCH 07/15] sched_feat_write: Update " Jan Blunck
2009-11-20 16:40 ` [PATCH 08/15] airo: Use " Jan Blunck
2009-11-20 16:40 ` [PATCH 09/15] frv: remove "struct file *" argument from sysctl ->proc_handler Jan Blunck
2009-11-20 16:40 ` [PATCH 10/15] mISDN: Remove unnecessary test on f_pos Jan Blunck
2009-11-20 16:40 ` [PATCH 11/15] zcrypt: Use nonseekable_open() Jan Blunck
2009-11-20 16:40 ` [PATCH 12/15] rtc-m41t80: " Jan Blunck
2009-11-20 16:40 ` [PATCH 13/15] Do not fallback to default_llseek() when readdir() uses BKL Jan Blunck
2009-11-20 21:27 ` Jan Kara
2009-11-21 18:03 ` Anders Larsen
2009-11-20 16:40 ` [PATCH 14/15] BKL: Remove BKL from default_llseek() Jan Blunck
2009-11-20 16:40 ` [PATCH 15/15] BKL: Update documentation on llseek( \b) Jan Blunck
2009-11-20 17:02 ` [PATCH 15/15] BKL: Update documentation on llseek(\b) Alan Cox
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=1258735245-25826-4-git-send-email-jblunck@suse.de \
--to=jblunck@suse.de \
--cc=James.Bottomley@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=arnd@arndb.de \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=jamie@shareable.org \
--cc=jkacur@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=osst@riede.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).