patch-2.4.25 linux-2.4.25/drivers/scsi/st.c
Next file: linux-2.4.25/drivers/sound/ac97_plugin_ad1980.c
Previous file: linux-2.4.25/drivers/scsi/sgiwd93.c
Back to the patch index
Back to the overall index
- Lines: 60
- Date:
2004-02-18 05:36:31.000000000 -0800
- Orig file:
linux-2.4.24/drivers/scsi/st.c
- Orig date:
2003-08-25 04:44:42.000000000 -0700
diff -urN linux-2.4.24/drivers/scsi/st.c linux-2.4.25/drivers/scsi/st.c
@@ -9,10 +9,10 @@
Steve Hirsch, Andreas Koppenh"ofer, Michael Leodolter, Eyal Lebedinsky,
Michael Schaefer, J"org Weule, and Eric Youngdale.
- Copyright 1992 - 2003 Kai Makisara
+ Copyright 1992 - 2004 Kai Makisara
email Kai.Makisara@kolumbus.fi
- Last modified: Sun Apr 6 22:44:42 2003 by makisara
+ Last modified: Fri Jan 2 17:50:08 2004 by makisara
Some small formal changes - aeb, 950809
Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
@@ -21,7 +21,7 @@
error handling will be discarded.
*/
-static char *verstr = "20030406";
+static char *verstr = "20040102";
#include <linux/module.h>
@@ -1277,6 +1277,18 @@
goto out;
}
+ if ((STp->buffer)->writing) {
+ write_behind_check(STp);
+ if ((STp->buffer)->syscall_result) {
+ DEBC(printk(ST_DEB_MSG "st%d: Async write error (write) %x.\n",
+ dev, (STp->buffer)->midlevel_result));
+ if ((STp->buffer)->midlevel_result == INT_MAX)
+ STps->eof = ST_EOM_OK;
+ else
+ STps->eof = ST_EOM_ERROR;
+ }
+ }
+
if (STp->block_size == 0) {
if (STp->max_block > 0 &&
(count < STp->min_block || count > STp->max_block)) {
@@ -1324,18 +1336,6 @@
}
}
- if ((STp->buffer)->writing) {
- write_behind_check(STp);
- if ((STp->buffer)->syscall_result) {
- DEBC(printk(ST_DEB_MSG "st%d: Async write error (write) %x.\n",
- dev, (STp->buffer)->midlevel_result));
- if ((STp->buffer)->midlevel_result == INT_MAX)
- STps->eof = ST_EOM_OK;
- else
- STps->eof = ST_EOM_ERROR;
- }
- }
-
if (STps->eof == ST_EOM_OK) {
retval = (-ENOSPC);
goto out;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)