Commit 511833acfc06c013d453e288f483c682c60ffbff
Committed by
James Bottomley
James Bottomley
1 parent
efc7a28838
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
SCSI: fix regression in scsi_send_eh_cmnd()
Commit ac61d1955934 (scsi: set correct completion code in scsi_send_eh_cmnd()) introduced a bug. It changed the stored return value from a queuecommand call, but it didn't take into account that the return value was used again later on. This patch fixes the bug by changing the later usage. There is a big comment in the middle of scsi_send_eh_cmnd() which does a good job of explaining how the routine works. But it mentions a "rtn = FAILURE" value that doesn't exist in the code. This patch adjusts the code to match the comment (I assume the comment is right and the code is wrong). This fixes Bugzilla #88341. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Reported-by: Андрей Аладьев <aladjev.andrew@gmail.com> Tested-by: Андрей Аладьев <aladjev.andrew@gmail.com> Fixes: ac61d19559349e205dad7b5122b281419aa74a82 Acked-by: Hannes Reinecke <hare@suse.de> Cc: <stable@vger.kernel.org> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
drivers/scsi/scsi_error.c
| ... | ... | @@ -1041,7 +1041,7 @@ |
| 1041 | 1041 | } |
| 1042 | 1042 | /* signal not to enter either branch of the if () below */ |
| 1043 | 1043 | timeleft = 0; |
| 1044 | - rtn = NEEDS_RETRY; | |
| 1044 | + rtn = FAILED; | |
| 1045 | 1045 | } else { |
| 1046 | 1046 | timeleft = wait_for_completion_timeout(&done, timeout); |
| 1047 | 1047 | rtn = SUCCESS; |
| ... | ... | @@ -1081,7 +1081,7 @@ |
| 1081 | 1081 | rtn = FAILED; |
| 1082 | 1082 | break; |
| 1083 | 1083 | } |
| 1084 | - } else if (!rtn) { | |
| 1084 | + } else if (rtn != FAILED) { | |
| 1085 | 1085 | scsi_abort_eh_cmnd(scmd); |
| 1086 | 1086 | rtn = FAILED; |
| 1087 | 1087 | } |