| Message ID | 20190729112902.GA3768@embeddedor (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 9fba647cfedc15e1ac80d396c116e106da947e55 |
| Headers | show |
| Series | scsi: ibmvscsi_tgt: Mark expected switch fall-throughs | expand |
On Mon, Jul 29, 2019 at 06:29:02AM -0500, Gustavo A. R. Silva wrote: > Mark switch cases where we are expecting to fall through. > > This patch fixes the following warnings (Building: powerpc allyesconfig): > > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_adapter_info': > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:1582:6: warning: this statement may fall through [-Wimplicit-fallthrough=] > if (connection_broken(vscsi)) > ^ > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:1584:2: note: here > default: > ^~~~~~~ > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_ping_response': > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2494:16: warning: this statement may fall through [-Wimplicit-fallthrough=] > vscsi->flags |= CLIENT_FAILED; > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2495:2: note: here > case H_DROPPED: > ^~~~ > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2496:16: warning: this statement may fall through [-Wimplicit-fallthrough=] > vscsi->flags |= RESPONSE_Q_DOWN; > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2497:2: note: here > case H_REMOTE_PARM: > ^~~~ > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by: Kees Cook <keescook@chromium.org> -Kees > --- > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c > index 7f9535392a93..a929fe76102b 100644 > --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c > +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c > @@ -1581,6 +1581,7 @@ static long ibmvscsis_adapter_info(struct scsi_info *vscsi, > case H_PERMISSION: > if (connection_broken(vscsi)) > flag_bits = (RESPONSE_Q_DOWN | CLIENT_FAILED); > + /* Fall through */ > default: > dev_err(&vscsi->dev, "adapter_info: h_copy_rdma to client failed, rc %ld\n", > rc); > @@ -2492,8 +2493,10 @@ static long ibmvscsis_ping_response(struct scsi_info *vscsi) > break; > case H_CLOSED: > vscsi->flags |= CLIENT_FAILED; > + /* Fall through */ > case H_DROPPED: > vscsi->flags |= RESPONSE_Q_DOWN; > + /* Fall through */ > case H_REMOTE_PARM: > dev_err(&vscsi->dev, "ping_response: h_send_crq failed, rc %ld\n", > rc); > -- > 2.22.0 >
> On Jul 29, 2019, at 6:29 AM, Gustavo A. R. Silva <gustavo@embeddedor.com> wrote: > > Mark switch cases where we are expecting to fall through. > > This patch fixes the following warnings (Building: powerpc allyesconfig): > > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_adapter_info': > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:1582:6: warning: this statement may fall through [-Wimplicit-fallthrough=] > if (connection_broken(vscsi)) > ^ > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:1584:2: note: here > default: > ^~~~~~~ > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_ping_response': > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2494:16: warning: this statement may fall through [-Wimplicit-fallthrough=] > vscsi->flags |= CLIENT_FAILED; > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2495:2: note: here > case H_DROPPED: > ^~~~ > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2496:16: warning: this statement may fall through [-Wimplicit-fallthrough=] > vscsi->flags |= RESPONSE_Q_DOWN; > drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2497:2: note: here > case H_REMOTE_PARM: > ^~~~ > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > — Reviewed-by: Bryant G. Ly <bly@catalogicsoftware.com> (Previous ibmvscsis_tgt maintainer, Mike doesn’t check his linux email often and might not see this) -Bryant
Gustavo,
> Mark switch cases where we are expecting to fall through.
Applied to 5.4/scsi-queue, thanks!
diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c index 7f9535392a93..a929fe76102b 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c @@ -1581,6 +1581,7 @@ static long ibmvscsis_adapter_info(struct scsi_info *vscsi, case H_PERMISSION: if (connection_broken(vscsi)) flag_bits = (RESPONSE_Q_DOWN | CLIENT_FAILED); + /* Fall through */ default: dev_err(&vscsi->dev, "adapter_info: h_copy_rdma to client failed, rc %ld\n", rc); @@ -2492,8 +2493,10 @@ static long ibmvscsis_ping_response(struct scsi_info *vscsi) break; case H_CLOSED: vscsi->flags |= CLIENT_FAILED; + /* Fall through */ case H_DROPPED: vscsi->flags |= RESPONSE_Q_DOWN; + /* Fall through */ case H_REMOTE_PARM: dev_err(&vscsi->dev, "ping_response: h_send_crq failed, rc %ld\n", rc);
Mark switch cases where we are expecting to fall through. This patch fixes the following warnings (Building: powerpc allyesconfig): drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_adapter_info': drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:1582:6: warning: this statement may fall through [-Wimplicit-fallthrough=] if (connection_broken(vscsi)) ^ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:1584:2: note: here default: ^~~~~~~ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c: In function 'ibmvscsis_ping_response': drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2494:16: warning: this statement may fall through [-Wimplicit-fallthrough=] vscsi->flags |= CLIENT_FAILED; drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2495:2: note: here case H_DROPPED: ^~~~ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2496:16: warning: this statement may fall through [-Wimplicit-fallthrough=] vscsi->flags |= RESPONSE_Q_DOWN; drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c:2497:2: note: here case H_REMOTE_PARM: ^~~~ Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +++ 1 file changed, 3 insertions(+)