2019-01-14 20:33:28

by Mathieu Malaterre

Subject: [PATCH 1/2] tracing: annotate implicit fall through

There is a plan to build the kernel with -Wimplicit-fallthrough and
this place in the code produced a warning (W=1).

This commit remove the following warning:

kernel/trace/trace_probe.c:302:6: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Mathieu Malaterre <[email protected]>
---
kernel/trace/trace_probe.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 9962cb5da8ac..89da34b326e3 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -300,6 +300,7 @@ parse_probe_arg(char *arg, const struct fetch_type *type,

case '+': /* deref memory */
arg++; /* Skip '+', because kstrtol() rejects it. */
+ /* fall through */
case '-':
tmp = strchr(arg, '(');
if (!tmp)
--
2.19.2

2019-01-14 20:32:58

by Mathieu Malaterre

Subject: [PATCH 2/2] tracing: annotate implicit fall through

There is a plan to build the kernel with -Wimplicit-fallthrough and
this place in the code produced a warning (W=1).

This commit remove the following warning:

kernel/trace/trace_events_filter.c:494:8: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Mathieu Malaterre <[email protected]>
---
kernel/trace/trace_events_filter.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 27821480105e..eb694756c4bb 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -495,6 +495,7 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
ptr++;
break;
}
+ /* fall through */
default:
parse_error(pe, FILT_ERR_TOO_MANY_PREDS,
next - str);
--
2.19.2

2019-01-14 21:35:58

by Steven Rostedt

Subject: Re: [PATCH 1/2] tracing: annotate implicit fall through

On Mon, 14 Jan 2019 21:30:37 +0100
Mathieu Malaterre <[email protected]> wrote:

> There is a plan to build the kernel with -Wimplicit-fallthrough and
> this place in the code produced a warning (W=1).
>
> This commit remove the following warning:
>
> kernel/trace/trace_probe.c:302:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>

I'm pulling this in, but I'm changing the subject. Even when doing
clean ups, don't use the exact same subject for multiple patches, it
gets confusing when looking for a specific change.

Also, Linus prefers that a subject header starts with a capital letter.

[PATCH 1/2] tracing: Annotate implicit fall through in parse_probe_arg()

-- Steve


> ---
> kernel/trace/trace_probe.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
> index 9962cb5da8ac..89da34b326e3 100644
> --- a/kernel/trace/trace_probe.c
> +++ b/kernel/trace/trace_probe.c
> @@ -300,6 +300,7 @@ parse_probe_arg(char *arg, const struct fetch_type *type,
>
> case '+': /* deref memory */
> arg++; /* Skip '+', because kstrtol() rejects it. */
> + /* fall through */
> case '-':
> tmp = strchr(arg, '(');
> if (!tmp)