From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Valentin Schneider <vschneid@redhat.com>
Subject: [for-linus][PATCH 10/11] tracing/filters: Change parse_pred() cpulist ternary into an if block
Date: Sat, 02 Sep 2023 07:50:45 -0400 [thread overview]
Message-ID: <20230902115120.096623405@goodmis.org> (raw)
In-Reply-To: 20230902115035.786076237@goodmis.org
From: Valentin Schneider <vschneid@redhat.com>
Review comments noted that an if block would be clearer than a ternary, so
swap it out.
No change in behaviour intended
Link: https://lkml.kernel.org/r/20230901151039.125186-4-vschneid@redhat.com
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Valentin Schneider <vschneid@redhat.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/trace_events_filter.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index eb331e8b00b6..09b4733a2933 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1782,13 +1782,17 @@ static int parse_pred(const char *str, void *data,
FILTER_PRED_FN_CPUMASK;
} else if (field->filter_type == FILTER_CPU) {
if (single) {
- pred->op = pred->op == OP_BAND ? OP_EQ : pred->op;
+ if (pred->op == OP_BAND)
+ pred->op = OP_EQ;
+
pred->fn_num = FILTER_PRED_FN_CPU;
} else {
pred->fn_num = FILTER_PRED_FN_CPU_CPUMASK;
}
} else if (single) {
- pred->op = pred->op == OP_BAND ? OP_EQ : pred->op;
+ if (pred->op == OP_BAND)
+ pred->op = OP_EQ;
+
pred->fn_num = select_comparison_fn(pred->op, field->size, false);
if (pred->op == OP_NE)
pred->not = 1;
--
2.40.1
next prev parent reply other threads:[~2023-09-02 11:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-02 11:50 [for-linus][PATCH 00/11] tracing: Minor fixes for 6.6 Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 01/11] rv: Set variable da_mon_##name to static Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 02/11] tracing: Remove extra space at the end of hwlat_detector/mode Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 03/11] tracing: Fix race issue between cpu buffer write and swap Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 04/11] tracing: Replace strlcpy with strscpy in trace/events/task.h Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 05/11] ftrace: Use within_module to check rec->ip within specified module Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 06/11] ftrace: Use LIST_HEAD to initialize clear_hash Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 07/11] tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 08/11] tracing/filters: Fix error-handling of cpulist parsing buffer Steven Rostedt
2023-09-02 11:50 ` [for-linus][PATCH 09/11] tracing/filters: Fix double-free of struct filter_pred.mask Steven Rostedt
2023-09-02 11:50 ` Steven Rostedt [this message]
2023-09-02 11:50 ` [for-linus][PATCH 11/11] tracing/filters: Fix coding style issues Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230902115120.096623405@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=vschneid@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.