2022-03-01 08:14:13

by Yang Li

Subject: [PATCH -next] scsi: Remove ignoring unreachable code warning

The smatch tool reported the following warning:
drivers/scsi/scsi_error.c:1988 scsi_decide_disposition() warn: ignoring
unreachable code.

Remove the "default:return FAILED;" instead of "return FAILED;" reported
by smatch, because compilers can provide more useful diagnostics about
switch/case statements that do not have a default statement, especially
if the "switch" applies to a value with enumeration type.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Yang Li <[email protected]>
---
drivers/scsi/scsi_error.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 9c237b223e63..ee752b4512f8 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1982,8 +1982,6 @@ enum scsi_disposition scsi_decide_disposition(struct scsi_cmnd *scmd)
"reservation conflict\n");
set_host_byte(scmd, DID_NEXUS_FAILURE);
return SUCCESS; /* causes immediate i/o error */
- default:
- return FAILED;
}
return FAILED;

--
2.20.1.7.g153144c

2022-03-21 17:23:22

by Martin K. Petersen

Subject: Re: [PATCH -next] scsi: Remove ignoring unreachable code warning

On Tue, 1 Mar 2022 16:04:48 +0800, Yang Li wrote:

> The smatch tool reported the following warning:
> drivers/scsi/scsi_error.c:1988 scsi_decide_disposition() warn: ignoring
> unreachable code.
>
> Remove the "default:return FAILED;" instead of "return FAILED;" reported
> by smatch, because compilers can provide more useful diagnostics about
> switch/case statements that do not have a default statement, especially
> if the "switch" applies to a value with enumeration type.
>
> [...]

Applied to 5.18/scsi-queue, thanks!

[1/1] scsi: Remove ignoring unreachable code warning
https://git.kernel.org/mkp/scsi/c/e1b353e7a31d

--
Martin K. Petersen Oracle Linux Engineering