aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_error.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2006-06-10 12:37:19 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-06-10 17:25:21 -0400
commit8d7feac3c7504425aaf61dc7d804685a6b89ee43 (patch)
tree0dd98c8cbfea10bdc748951cf9dc10b44f0042eb /drivers/scsi/scsi_error.c
parentbeb40487508290f5d6565598c60a3f44261beef2 (diff)
[SCSI] remove RQ_SCSI_* flags
The RQ_SCSI_* flags are a vestiage of a long past history. The EH code still sets them but we never make use of that information. The other users is pluto.c which never had a chance to work but needs to be kept compiling to keep Davem happy, so copy over the definition there. We could probably get rid of RQ_ACTIVE/RQ_INACTIVE aswell with some work, there's only two more or less bogus looking uses in ubd and scsi. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_error.c')
-rw-r--r--drivers/scsi/scsi_error.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 471a43102923..1c7d993fa8ad 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -452,7 +452,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
452 (sdev->lun << 5 & 0xe0); 452 (sdev->lun << 5 & 0xe0);
453 453
454 shost->eh_action = &done; 454 shost->eh_action = &done;
455 scmd->request->rq_status = RQ_SCSI_BUSY;
456 455
457 spin_lock_irqsave(shost->host_lock, flags); 456 spin_lock_irqsave(shost->host_lock, flags);
458 scsi_log_send(scmd); 457 scsi_log_send(scmd);
@@ -461,7 +460,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
461 460
462 timeleft = wait_for_completion_timeout(&done, timeout); 461 timeleft = wait_for_completion_timeout(&done, timeout);
463 462
464 scmd->request->rq_status = RQ_SCSI_DONE;
465 shost->eh_action = NULL; 463 shost->eh_action = NULL;
466 464
467 scsi_log_completion(scmd, SUCCESS); 465 scsi_log_completion(scmd, SUCCESS);
@@ -1657,7 +1655,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
1657 1655
1658 scmd->request = &req; 1656 scmd->request = &req;
1659 memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout)); 1657 memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout));
1660 scmd->request->rq_status = RQ_SCSI_BUSY;
1661 1658
1662 memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd)); 1659 memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd));
1663 1660