aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/scsi.c')
-rw-r--r--drivers/scsi/scsi.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index b25e5e531eb9..1afe1e592af4 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -259,7 +259,6 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, int gfp_mask)
259 259
260 memset(cmd, 0, sizeof(*cmd)); 260 memset(cmd, 0, sizeof(*cmd));
261 cmd->device = dev; 261 cmd->device = dev;
262 cmd->state = SCSI_STATE_UNUSED;
263 init_timer(&cmd->eh_timeout); 262 init_timer(&cmd->eh_timeout);
264 INIT_LIST_HEAD(&cmd->list); 263 INIT_LIST_HEAD(&cmd->list);
265 spin_lock_irqsave(&dev->list_lock, flags); 264 spin_lock_irqsave(&dev->list_lock, flags);
@@ -609,9 +608,6 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
609 * We will use a queued command if possible, otherwise we will 608 * We will use a queued command if possible, otherwise we will
610 * emulate the queuing and calling of completion function ourselves. 609 * emulate the queuing and calling of completion function ourselves.
611 */ 610 */
612
613 cmd->state = SCSI_STATE_QUEUED;
614
615 atomic_inc(&cmd->device->iorequest_cnt); 611 atomic_inc(&cmd->device->iorequest_cnt);
616 612
617 /* 613 /*
@@ -764,7 +760,6 @@ void __scsi_done(struct scsi_cmnd *cmd)
764 * Set the serial numbers back to zero 760 * Set the serial numbers back to zero
765 */ 761 */
766 cmd->serial_number = 0; 762 cmd->serial_number = 0;
767 cmd->state = SCSI_STATE_BHQUEUE;
768 763
769 atomic_inc(&cmd->device->iodone_cnt); 764 atomic_inc(&cmd->device->iodone_cnt);
770 if (cmd->result) 765 if (cmd->result)
@@ -885,8 +880,6 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
885 SCSI_LOG_MLCOMPLETE(4, printk("Notifying upper driver of completion " 880 SCSI_LOG_MLCOMPLETE(4, printk("Notifying upper driver of completion "
886 "for device %d %x\n", sdev->id, cmd->result)); 881 "for device %d %x\n", sdev->id, cmd->result));
887 882
888 cmd->state = SCSI_STATE_FINISHED;
889
890 /* 883 /*
891 * We can get here with use_sg=0, causing a panic in the upper level 884 * We can get here with use_sg=0, causing a panic in the upper level
892 */ 885 */