Commit a4c8f628 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

[SCSI] remove scsi_cmnd.eh_state

it's never set to anything, and just three broken drivers are looking
at it and doing odd things.
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent fa4c4966
...@@ -418,11 +418,6 @@ static int adpt_queue(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd *)) ...@@ -418,11 +418,6 @@ static int adpt_queue(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd *))
return 1; return 1;
} }
if(cmd->eh_state != SCSI_STATE_QUEUED){
// If we are not doing error recovery
mod_timer(&cmd->eh_timeout, timeout);
}
// TODO if the cmd->device if offline then I may need to issue a bus rescan // TODO if the cmd->device if offline then I may need to issue a bus rescan
// followed by a get_lct to see if the device is there anymore // followed by a get_lct to see if the device is there anymore
if((pDev = (struct adpt_device*) (cmd->device->hostdata)) == NULL) { if((pDev = (struct adpt_device*) (cmd->device->hostdata)) == NULL) {
......
...@@ -1899,16 +1899,6 @@ static int eata2x_eh_abort(struct scsi_cmnd *SCarg) ...@@ -1899,16 +1899,6 @@ static int eata2x_eh_abort(struct scsi_cmnd *SCarg)
printk("%s: abort, mbox %d, interrupt pending.\n", printk("%s: abort, mbox %d, interrupt pending.\n",
ha->board_name, i); ha->board_name, i);
if (SCarg->eh_state == SCSI_STATE_TIMEOUT) {
unmap_dma(i, ha);
SCarg->host_scribble = NULL;
ha->cp_stat[i] = FREE;
printk
("%s, abort, mbox %d, eh_state timeout, pid %ld.\n",
ha->board_name, i, SCarg->pid);
return SUCCESS;
}
return FAILED; return FAILED;
} }
......
...@@ -1372,15 +1372,6 @@ static int u14_34f_eh_abort(struct scsi_cmnd *SCarg) { ...@@ -1372,15 +1372,6 @@ static int u14_34f_eh_abort(struct scsi_cmnd *SCarg) {
if (inb(sh[j]->io_port + REG_SYS_INTR) & IRQ_ASSERTED) if (inb(sh[j]->io_port + REG_SYS_INTR) & IRQ_ASSERTED)
printk("%s: abort, mbox %d, interrupt pending.\n", BN(j), i); printk("%s: abort, mbox %d, interrupt pending.\n", BN(j), i);
if (SCarg->eh_state == SCSI_STATE_TIMEOUT) {
unmap_dma(i, j);
SCarg->host_scribble = NULL;
HD(j)->cp_stat[i] = FREE;
printk("%s, abort, mbox %d, eh_state timeout, pid %ld.\n",
BN(j), i, SCarg->pid);
return SUCCESS;
}
return FAILED; return FAILED;
} }
......
...@@ -38,7 +38,6 @@ struct scsi_cmnd { ...@@ -38,7 +38,6 @@ struct scsi_cmnd {
struct list_head list; /* scsi_cmnd participates in queue lists */ struct list_head list; /* scsi_cmnd participates in queue lists */
struct list_head eh_entry; /* entry for the host eh_cmd_q */ struct list_head eh_entry; /* entry for the host eh_cmd_q */
int eh_state; /* Used for state tracking in error handlr */
int eh_eflags; /* Used by error handlr */ int eh_eflags; /* Used by error handlr */
void (*done) (struct scsi_cmnd *); /* Mid-level done function */ void (*done) (struct scsi_cmnd *); /* Mid-level done function */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment