diff options
author | Christoph Hellwig <hch@lst.de> | 2005-06-19 07:42:05 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-06-26 13:16:24 -0400 |
commit | 8d115f845a0bd59cd263e791f739964f42b7b0e8 (patch) | |
tree | 8d4af0e70f0d8d5c04e2efa1d68fe507dc5d8923 /drivers/scsi/scsi_error.c | |
parent | b4edcbcafdecc80ef5356ff6452768b1b926ea76 (diff) |
[SCSI] remove scsi_cmnd->state
We never look at it except for the old megaraid driver that abuses it
for sending internal commands. That usage can be fixed easily because
those internal commands are single-threaded by a mutex and we can easily
use a completion there.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_error.c')
-rw-r--r-- | drivers/scsi/scsi_error.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 0df8615732c1..4f312da021f1 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
@@ -74,10 +74,6 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag) | |||
74 | spin_lock_irqsave(shost->host_lock, flags); | 74 | spin_lock_irqsave(shost->host_lock, flags); |
75 | 75 | ||
76 | scsi_eh_eflags_set(scmd, eh_flag); | 76 | scsi_eh_eflags_set(scmd, eh_flag); |
77 | /* | ||
78 | * FIXME: Can we stop setting owner and state. | ||
79 | */ | ||
80 | scmd->state = SCSI_STATE_FAILED; | ||
81 | list_add_tail(&scmd->eh_entry, &shost->eh_cmd_q); | 77 | list_add_tail(&scmd->eh_entry, &shost->eh_cmd_q); |
82 | set_bit(SHOST_RECOVERY, &shost->shost_state); | 78 | set_bit(SHOST_RECOVERY, &shost->shost_state); |
83 | shost->host_failed++; | 79 | shost->host_failed++; |
@@ -634,8 +630,6 @@ static void scsi_eh_finish_cmd(struct scsi_cmnd *scmd, | |||
634 | struct list_head *done_q) | 630 | struct list_head *done_q) |
635 | { | 631 | { |
636 | scmd->device->host->host_failed--; | 632 | scmd->device->host->host_failed--; |
637 | scmd->state = SCSI_STATE_BHQUEUE; | ||
638 | |||
639 | scsi_eh_eflags_clr_all(scmd); | 633 | scsi_eh_eflags_clr_all(scmd); |
640 | 634 | ||
641 | /* | 635 | /* |
@@ -1803,7 +1797,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag) | |||
1803 | scmd->request = &req; | 1797 | scmd->request = &req; |
1804 | memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout)); | 1798 | memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout)); |
1805 | scmd->request->rq_status = RQ_SCSI_BUSY; | 1799 | scmd->request->rq_status = RQ_SCSI_BUSY; |
1806 | scmd->state = SCSI_STATE_INITIALIZING; | ||
1807 | 1800 | ||
1808 | memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd)); | 1801 | memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd)); |
1809 | 1802 | ||