This patch applies over the previous patch in this thread. The patch removes
updating filp->f_pos. It has been dead code since 2.6.8 and nobody has missed
it.
Signed-off-by: Kai Makisara <[EMAIL PROTECTED]>
--- linux-2.6.11-bk7-k2/drivers/scsi/st.c 2005-03-12 13:52:30.000000000
+0200
+++ linux-2.6.11-bk7-k3/drivers/scsi/st.c 2005-03-12 18:11:11.000000000
+0200
@@ -1156,9 +1156,7 @@ static int st_flush(struct file *filp)
if (STps->rw == ST_WRITING && !STp->pos_unknown) {
struct st_cmdstatus *cmdstatp = &STp->buffer->cmdstat;
- DEBC(printk(ST_DEB_MSG "%s: File length %lld bytes.\n",
- name, (long long)filp->f_pos);
- printk(ST_DEB_MSG "%s: Async write waits %d, finished
%d.\n",
+ DEBC(printk(ST_DEB_MSG "%s: Async write waits %d, finished
%d.\n",
name, STp->nbr_waits, STp->nbr_finished);
)
@@ -1520,7 +1518,6 @@ st_write(struct file *filp, const char _
}
}
count -= do_count;
- filp->f_pos += do_count;
b_point += do_count;
async_write = STp->block_size == 0 && !STbp->do_dio &&
@@ -1580,7 +1577,6 @@ st_write(struct file *filp, const char _
undone = 0;
if (STp->block_size != 0)
undone *= STp->block_size;
- filp->f_pos -= undone;
if (undone <= do_count) {
/* Only data from this write is not
written */
count += undone;
@@ -1629,7 +1625,6 @@ st_write(struct file *filp, const char _
}
}
} else {
- filp->f_pos -= do_count;
count += do_count;
STps->drv_block = (-1); /* Too
cautious? */
retval = (-EIO);
@@ -1958,7 +1953,6 @@ st_read(struct file *filp, char __user *
goto out;
}
}
- filp->f_pos += transfer;
buf += transfer;
total += transfer;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
