scsi: set correct completion code in scsi_send_eh_cmnd()

hreinecke · Christoph Hellwig · commit ac61d1955934 · 2014-05-19T12:35:11.000+02:00
-&gt;queuecommand returns '0' for successful command submission,
so we need to set the correct SCSI midlayer return value
when calling scsi_log_completion().

Signed-off-by: Hannes Reinecke &lt;hare@suse.de&gt;
Reported-by: Robert Elliott &lt;elliott@hp.com&gt;
Cc: Stephen Cameron &lt;scameron@beardog.cce.hp.com&gt;
Tested-by: Robert Elliott &lt;elliott@hp.com&gt;
Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
@@ -1029,6 +1029,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
 		rtn = NEEDS_RETRY;
 	} else {
 		timeleft = wait_for_completion_timeout(&done, timeout);
+		rtn = SUCCESS;
 	}
 
 	shost->eh_action = NULL;

Original file line number	Diff line number	Diff line change
`@@ -1029,6 +1029,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd scmd, unsigned char cmnd,`
`1029`	`1029`	`rtn = NEEDS_RETRY;`
`1030`	`1030`	`} else {`
`1031`	`1031`	`timeleft = wait_for_completion_timeout(&done, timeout);`
	`1032`	`+ rtn = SUCCESS;`
`1032`	`1033`	`}`
`1033`	`1034`
`1034`	`1035`	`shost->eh_action = NULL;`