diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-03-15 15:16:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 15:16:02 -0800 |
| commit | 4e9fbe87b0efa47f23628dfe334951382fe963fb (patch) | |
| tree | 8abbad7dadaa9933e175e3ac40e861ed3eb8891c /include/linux | |
| parent | e5c539b8e8d3aa788d2738add7c85e6ff6f2163e (diff) | |
[PATCH] ide-scsi error handling fixes
From: Willem Riede <wrlk@riede.org>
The patch revises the error handling in ide-scsi, fixing the scheduling
while locked issues, and make it work properly, at least for me...
Specific changes in this patch:
- introduce idescsi_expiry, a timeout routine for the ide subsystem,
which simply flags the fact that the command timed out, but postpones
any other action until either the command still finishes on its own
(unlikely?) or the scsi error handler kicks in;
- introduce idescsi_atapi_error and idescsi_atapi_abort, error routines
for the ide subsystem, which are modeled after those of ide-cd, but
take only minimal effort to recover, leaving the heavy lifting for
the scsi error handler;
- rewrite (and rename for clarity) idescsi_eh_abort and idescsi_eh_error,
the abort/error routines to be called by the scsi error handler --
this redesign should not have the scheduling while atomic problems
of the old implementation.
- move ide_cdrom_dump_status() from ide-cd.c to ide-lib.c as
ide_dump_atapi_status() and both ide-cd and ide-scsi call it.
- replaces BUG() by WARN_ON()/printk in the error handling code.
- sets TASK_UNINTERRUPTIBLE before schedule_timeout() and moves the host
unlock/lock around the while loop inside the loop in idescsi_eh_reset().
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index ccb9368c6efd..1ad87c679105 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1612,6 +1612,7 @@ extern int ide_dma_enable(ide_drive_t *drive); extern char *ide_xfer_verbose(u8 xfer_rate); extern void ide_toggle_bounce(ide_drive_t *drive, int on); extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate); +extern byte ide_dump_atapi_status(ide_drive_t *drive, const char *msg, byte stat); typedef struct ide_pio_timings_s { int setup_time; /* Address setup (ns) minimum */ |
