Commit 644373a4 authored by Alan Stern's avatar Alan Stern Committed by James Bottomley
Browse files

[SCSI] Fix command result state propagation 



We're seeing a case where the contents of scmd->result isn't being reset after
a SCSI command encounters an error, is resubmitted, times out and then gets
handled.  The error handler acts on the stale result of the previous error
instead of the timeout.  Fix this by properly zeroing the scmd->status before
the command is resubmitted.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent d555a2ab

drivers/scsi/scsi_error.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -924,6 +924,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, 
	memset(scmd->cmnd, 0, BLK_MAX_CDB);

	memset(scmd->cmnd, 0, BLK_MAX_CDB);

	memset(&scmd->sdb, 0, sizeof(scmd->sdb));

	memset(&scmd->sdb, 0, sizeof(scmd->sdb));

	scmd->request->next_rq = NULL;

	scmd->request->next_rq = NULL;

	scmd->result = 0;





	if (sense_bytes) {

	if (sense_bytes) {

		scmd->sdb.length = min_t(unsigned, SCSI_SENSE_BUFFERSIZE,

		scmd->sdb.length = min_t(unsigned, SCSI_SENSE_BUFFERSIZE,

drivers/scsi/scsi_lib.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,7 @@ static void __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy) 
	 * lock such that the kblockd_schedule_work() call happens

	 * lock such that the kblockd_schedule_work() call happens

	 * before blk_cleanup_queue() finishes.

	 * before blk_cleanup_queue() finishes.

	 */

	 */

	cmd->result = 0;

	spin_lock_irqsave(q->queue_lock, flags);

	spin_lock_irqsave(q->queue_lock, flags);

	blk_requeue_request(q, cmd->request);

	blk_requeue_request(q, cmd->request);

	kblockd_schedule_work(q, &device->requeue_work);

	kblockd_schedule_work(q, &device->requeue_work);

CRA Git | Maintained and supported by SUSTech CRA and CCSE