3 files changed, 3 insertions, 6 deletions

diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index 46624ab9c3d2..83a671799934 100644
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -27,6 +27,9 @@
 
 #include <linux/module.h>
 
+#define RQ_SCSI_BUSY            0xffff
+#define RQ_SCSI_DONE            0xfffe
+
 /* #define PLUTO_DEBUG */
 
 #define pluto_printk printk ("PLUTO %s: ", fc->name); printk
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)
                         (sdev->lun << 5 & 0xe0);
 
         shost->eh_action = &done;
-        scmd->request->rq_status = RQ_SCSI_BUSY;
 
         spin_lock_irqsave(shost->host_lock, flags);
         scsi_log_send(scmd);
@@ -461,7 +460,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
 
         timeleft = wait_for_completion_timeout(&done, timeout);
 
-        scmd->request->rq_status = RQ_SCSI_DONE;
         shost->eh_action = NULL;
 
         scsi_log_completion(scmd, SUCCESS);
@@ -1657,7 +1655,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
 
         scmd->request = &req;
         memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout));
-        scmd->request->rq_status        = RQ_SCSI_BUSY;
 
         memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd));
     
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 59e1259b1c40..c889c459fd1b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -439,9 +439,6 @@ struct request_queue
 
 #define RQ_INACTIVE             (-1)
 #define RQ_ACTIVE               1
-#define RQ_SCSI_BUSY            0xffff
-#define RQ_SCSI_DONE            0xfffe
-#define RQ_SCSI_DISCONNECTING   0xffe0
 
 #define QUEUE_FLAG_CLUSTER      0       /* cluster several segments into 1 */
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */