Merge branch 'master' into upstream

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/libata-scsi.c
	include/linux/pci_ids.h

1 files changed, 1 insertions, 14 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 346ab72ebf86..6a7a60fc0a4e 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -26,13 +26,13 @@
 #include <linux/delay.h>
 
 #include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_dbg.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_request.h>
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
@@ -474,7 +474,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);
@@ -483,7 +482,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);
@@ -1679,7 +1677,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));
     
@@ -1693,8 +1690,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
         scmd->cmd_len                   = 0;
 
         scmd->sc_data_direction         = DMA_BIDIRECTIONAL;
-        scmd->sc_request                = NULL;
-        scmd->sc_magic                  = SCSI_CMND_MAGIC;
 
         init_timer(&scmd->eh_timeout);
 
@@ -1791,14 +1786,6 @@ int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
 }
 EXPORT_SYMBOL(scsi_normalize_sense);
 
-int scsi_request_normalize_sense(struct scsi_request *sreq,
-                                 struct scsi_sense_hdr *sshdr)
-{
-        return scsi_normalize_sense(sreq->sr_sense_buffer,
-                        sizeof(sreq->sr_sense_buffer), sshdr);
-}
-EXPORT_SYMBOL(scsi_request_normalize_sense);
-
 int scsi_command_normalize_sense(struct scsi_cmnd *cmd,
                                  struct scsi_sense_hdr *sshdr)
 {