diff options
| -rw-r--r-- | drivers/scsi/scsi_error.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index d020149ea8d4..2953bfa92da7 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
| @@ -924,6 +924,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, | |||
| 924 | memset(scmd->cmnd, 0, BLK_MAX_CDB); | 924 | memset(scmd->cmnd, 0, BLK_MAX_CDB); |
| 925 | memset(&scmd->sdb, 0, sizeof(scmd->sdb)); | 925 | memset(&scmd->sdb, 0, sizeof(scmd->sdb)); |
| 926 | scmd->request->next_rq = NULL; | 926 | scmd->request->next_rq = NULL; |
| 927 | scmd->result = 0; | ||
| 927 | 928 | ||
| 928 | if (sense_bytes) { | 929 | if (sense_bytes) { |
| 929 | scmd->sdb.length = min_t(unsigned, SCSI_SENSE_BUFFERSIZE, | 930 | scmd->sdb.length = min_t(unsigned, SCSI_SENSE_BUFFERSIZE, |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 7fa54fe51f63..9db097a28a74 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -137,6 +137,7 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy) | |||
| 137 | * lock such that the kblockd_schedule_work() call happens | 137 | * lock such that the kblockd_schedule_work() call happens |
| 138 | * before blk_cleanup_queue() finishes. | 138 | * before blk_cleanup_queue() finishes. |
| 139 | */ | 139 | */ |
| 140 | cmd->result = 0; | ||
| 140 | spin_lock_irqsave(q->queue_lock, flags); | 141 | spin_lock_irqsave(q->queue_lock, flags); |
| 141 | blk_requeue_request(q, cmd->request); | 142 | blk_requeue_request(q, cmd->request); |
| 142 | kblockd_schedule_work(q, &device->requeue_work); | 143 | kblockd_schedule_work(q, &device->requeue_work); |
