2019-05-07 14:24:38

by Gustavo A. R. Silva

Subject: [PATCH] nvme-pci: mark expected switch fall-through

In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/nvme/host/pci.c: In function ‘nvme_timeout’:
drivers/nvme/host/pci.c:1298:12: warning: this statement may fall through [-Wimplicit-fallthrough=]
shutdown = true;
~~~~~~~~~^~~~~~
drivers/nvme/host/pci.c:1299:2: note: here
case NVME_CTRL_CONNECTING:
^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable
-Wimplicit-fallthrough.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/nvme/host/pci.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 3e4fb891a95a..a12f992868c9 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1296,6 +1296,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
switch (dev->ctrl.state) {
case NVME_CTRL_DELETING:
shutdown = true;
+ /* fall through */
case NVME_CTRL_CONNECTING:
case NVME_CTRL_RESETTING:
dev_warn_ratelimited(dev->ctrl.device,
--
2.21.0

2019-05-07 14:28:34

by Keith Busch

Subject: Re: [PATCH] nvme-pci: mark expected switch fall-through

On Tue, May 07, 2019 at 09:23:00AM -0500, Gustavo A. R. Silva wrote:
> @@ -1296,6 +1296,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
> switch (dev->ctrl.state) {
> case NVME_CTRL_DELETING:
> shutdown = true;
> + /* fall through */
> case NVME_CTRL_CONNECTING:
> case NVME_CTRL_RESETTING:
> dev_warn_ratelimited(dev->ctrl.device,

Thanks, Looks good.

Reviewed-by: Keith Busch <[email protected]>

2019-05-07 17:43:24

by Chaitanya Kulkarni

Subject: Re: [PATCH] nvme-pci: mark expected switch fall-through

Looks good.

Reviewed-by: Chaitanya Kulkarni <[email protected]>

On 5/7/19 7:23 AM, Gustavo A. R. Silva wrote:
> In preparation to enabling -Wimplicit-fallthrough, mark switch
> cases where we are expecting to fall through.
>
> This patch fixes the following warning:
>
> drivers/nvme/host/pci.c: In function ?nvme_timeout?:
> drivers/nvme/host/pci.c:1298:12: warning: this statement may fall through [-Wimplicit-fallthrough=]
> shutdown = true;
> ~~~~~~~~~^~~~~~
> drivers/nvme/host/pci.c:1299:2: note: here
> case NVME_CTRL_CONNECTING:
> ^~~~
>
> Warning level 3 was used: -Wimplicit-fallthrough=3
>
> This patch is part of the ongoing efforts to enable
> -Wimplicit-fallthrough.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> drivers/nvme/host/pci.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 3e4fb891a95a..a12f992868c9 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -1296,6 +1296,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
> switch (dev->ctrl.state) {
> case NVME_CTRL_DELETING:
> shutdown = true;
> + /* fall through */
> case NVME_CTRL_CONNECTING:
> case NVME_CTRL_RESETTING:
> dev_warn_ratelimited(dev->ctrl.device,

2019-05-08 07:19:35

by Christoph Hellwig

Subject: Re: [PATCH] nvme-pci: mark expected switch fall-through

Thanks,

applied to nvme-5.2.

2019-05-08 14:54:47

by Gustavo A. R. Silva

Subject: Re: [PATCH] nvme-pci: mark expected switch fall-through

On 5/8/19 2:18 AM, Christoph Hellwig wrote:
> Thanks,
>
> applied to nvme-5.2.
>

Great. :)

Thanks, Christoph.
--
Gustavo