2020-07-27 22:59:45

by Gustavo A. R. Silva

Subject: [PATCH v2][next] bcache: Use fallthrough pseudo-keyword

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1].

[1] https://www.kernel.org/doc/html/v5.7/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
Changes in v2:
- Add missing semicolon.

drivers/md/bcache/journal.c | 2 +-
drivers/md/bcache/util.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index 77fbfd52edcf..c1227bdb57e7 100644
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -608,7 +608,7 @@ static void do_journal_discard(struct cache *ca)
ca->sb.njournal_buckets;

atomic_set(&ja->discard_in_flight, DISCARD_READY);
- /* fallthrough */
+ fallthrough;

case DISCARD_READY:
if (ja->discard_idx == ja->last_idx)
diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
index 62fb917f7a4f..ae380bc3992e 100644
--- a/drivers/md/bcache/util.c
+++ b/drivers/md/bcache/util.c
@@ -33,27 +33,27 @@ int bch_ ## name ## _h(const char *cp, type *res) \
case 'y': \
case 'z': \
u++; \
- /* fall through */ \
+ fallthrough; \
case 'e': \
u++; \
- /* fall through */ \
+ fallthrough; \
case 'p': \
u++; \
- /* fall through */ \
+ fallthrough; \
case 't': \
u++; \
- /* fall through */ \
+ fallthrough; \
case 'g': \
u++; \
- /* fall through */ \
+ fallthrough; \
case 'm': \
u++; \
- /* fall through */ \
+ fallthrough; \
case 'k': \
u++; \
if (e++ == cp) \
return -EINVAL; \
- /* fall through */ \
+ fallthrough; \
case '\n': \
case '\0': \
if (*e == '\n') \
--
2.27.0

2020-07-28 12:50:09

by Coly Li

Subject: Re: [PATCH v2][next] bcache: Use fallthrough pseudo-keyword

On 2020/7/28 07:04, Gustavo A. R. Silva wrote:
> Replace the existing /* fall through */ comments and its variants with
> the new pseudo-keyword macro fallthrough[1].
>
> [1] https://www.kernel.org/doc/html/v5.7/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

I am OK with it, add it to my second for-next series.

Thanks.

Coly Li


> ---
> Changes in v2:
> - Add missing semicolon.
>
> drivers/md/bcache/journal.c | 2 +-
> drivers/md/bcache/util.c | 14 +++++++-------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
> index 77fbfd52edcf..c1227bdb57e7 100644
> --- a/drivers/md/bcache/journal.c
> +++ b/drivers/md/bcache/journal.c
> @@ -608,7 +608,7 @@ static void do_journal_discard(struct cache *ca)
> ca->sb.njournal_buckets;
>
> atomic_set(&ja->discard_in_flight, DISCARD_READY);
> - /* fallthrough */
> + fallthrough;
>
> case DISCARD_READY:
> if (ja->discard_idx == ja->last_idx)
> diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
> index 62fb917f7a4f..ae380bc3992e 100644
> --- a/drivers/md/bcache/util.c
> +++ b/drivers/md/bcache/util.c
> @@ -33,27 +33,27 @@ int bch_ ## name ## _h(const char *cp, type *res) \
> case 'y': \
> case 'z': \
> u++; \
> - /* fall through */ \
> + fallthrough; \
> case 'e': \
> u++; \
> - /* fall through */ \
> + fallthrough; \
> case 'p': \
> u++; \
> - /* fall through */ \
> + fallthrough; \
> case 't': \
> u++; \
> - /* fall through */ \
> + fallthrough; \
> case 'g': \
> u++; \
> - /* fall through */ \
> + fallthrough; \
> case 'm': \
> u++; \
> - /* fall through */ \
> + fallthrough; \
> case 'k': \
> u++; \
> if (e++ == cp) \
> return -EINVAL; \
> - /* fall through */ \
> + fallthrough; \
> case '\n': \
> case '\0': \
> if (*e == '\n') \
>