The field 'reacting' in struct rv_monitor is set but never used. Delete it.
Signed-off-by: Nam Cao <namcao@linutronix.de>
---
include/linux/rv.h | 1 -
kernel/trace/rv/rv_reactors.c | 14 ++++++--------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/include/linux/rv.h b/include/linux/rv.h
index 2f867d6f72ba..80731242fe60 100644
--- a/include/linux/rv.h
+++ b/include/linux/rv.h
@@ -104,7 +104,6 @@ struct rv_monitor {
#ifdef CONFIG_RV_REACTORS
struct rv_reactor *reactor;
__printf(1, 2) void (*react)(const char *msg, ...);
- bool reacting;
#endif
struct list_head list;
struct rv_monitor *parent;
diff --git a/kernel/trace/rv/rv_reactors.c b/kernel/trace/rv/rv_reactors.c
index aee622e4b833..6b03f3f6ecc1 100644
--- a/kernel/trace/rv/rv_reactors.c
+++ b/kernel/trace/rv/rv_reactors.c
@@ -149,7 +149,7 @@ static const struct seq_operations monitor_reactors_seq_ops = {
static void monitor_swap_reactors_single(struct rv_monitor *mon,
struct rv_reactor *reactor,
- bool reacting, bool nested)
+ bool nested)
{
bool monitor_enabled;
@@ -162,7 +162,6 @@ static void monitor_swap_reactors_single(struct rv_monitor *mon,
rv_disable_monitor(mon);
mon->reactor = reactor;
- mon->reacting = reacting;
mon->react = reactor ? reactor->react : NULL;
/* enable only once if iterating through a container */
@@ -170,8 +169,7 @@ static void monitor_swap_reactors_single(struct rv_monitor *mon,
rv_enable_monitor(mon);
}
-static void monitor_swap_reactors(struct rv_monitor *mon,
- struct rv_reactor *reactor, bool reacting)
+static void monitor_swap_reactors(struct rv_monitor *mon, struct rv_reactor *reactor)
{
struct rv_monitor *p = mon;
@@ -179,7 +177,7 @@ static void monitor_swap_reactors(struct rv_monitor *mon,
list_for_each_entry_continue(p, &rv_monitors_list, list) {
if (p->parent != mon)
break;
- monitor_swap_reactors_single(p, reactor, reacting, true);
+ monitor_swap_reactors_single(p, reactor, true);
}
/*
* This call enables and disables the monitor if they were active.
@@ -187,7 +185,7 @@ static void monitor_swap_reactors(struct rv_monitor *mon,
* All nested monitors are enabled also if they were off, we may refine
* this logic in the future.
*/
- monitor_swap_reactors_single(mon, reactor, reacting, false);
+ monitor_swap_reactors_single(mon, reactor, false);
}
static ssize_t
@@ -221,7 +219,7 @@ monitor_reactors_write(struct file *file, const char __user *user_buf,
len = strlen(ptr);
if (!len) {
- monitor_swap_reactors(mon, NULL, false);
+ monitor_swap_reactors(mon, NULL);
return count;
}
@@ -233,7 +231,7 @@ monitor_reactors_write(struct file *file, const char __user *user_buf,
if (strcmp(ptr, reactor->name) != 0)
continue;
- monitor_swap_reactors(mon, reactor, true);
+ monitor_swap_reactors(mon, reactor);
retval = count;
break;
--
2.39.5On Mon, 2025-07-21 at 11:47 +0200, Nam Cao wrote:
> The field 'reacting' in struct rv_monitor is set but never used.
> Delete it.
>
> Signed-off-by: Nam Cao <namcao@linutronix.de>
> ---
Yeah seems to be the case, thanks for spotting it.
Reviewed-by: Gabriele Monaco <gmonaco@redhat.com>
> include/linux/rv.h | 1 -
> kernel/trace/rv/rv_reactors.c | 14 ++++++--------
> 2 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/include/linux/rv.h b/include/linux/rv.h
> index 2f867d6f72ba..80731242fe60 100644
> --- a/include/linux/rv.h
> +++ b/include/linux/rv.h
> @@ -104,7 +104,6 @@ struct rv_monitor {
> #ifdef CONFIG_RV_REACTORS
> struct rv_reactor *reactor;
> __printf(1, 2) void (*react)(const char *msg, ...);
> - bool reacting;
> #endif
> struct list_head list;
> struct rv_monitor *parent;
> diff --git a/kernel/trace/rv/rv_reactors.c
> b/kernel/trace/rv/rv_reactors.c
> index aee622e4b833..6b03f3f6ecc1 100644
> --- a/kernel/trace/rv/rv_reactors.c
> +++ b/kernel/trace/rv/rv_reactors.c
> @@ -149,7 +149,7 @@ static const struct seq_operations
> monitor_reactors_seq_ops = {
>
> static void monitor_swap_reactors_single(struct rv_monitor *mon,
> struct rv_reactor *reactor,
> - bool reacting, bool nested)
> + bool nested)
> {
> bool monitor_enabled;
>
> @@ -162,7 +162,6 @@ static void monitor_swap_reactors_single(struct
> rv_monitor *mon,
> rv_disable_monitor(mon);
>
> mon->reactor = reactor;
> - mon->reacting = reacting;
> mon->react = reactor ? reactor->react : NULL;
>
> /* enable only once if iterating through a container */
> @@ -170,8 +169,7 @@ static void monitor_swap_reactors_single(struct
> rv_monitor *mon,
> rv_enable_monitor(mon);
> }
>
> -static void monitor_swap_reactors(struct rv_monitor *mon,
> - struct rv_reactor *reactor, bool
> reacting)
> +static void monitor_swap_reactors(struct rv_monitor *mon, struct
> rv_reactor *reactor)
> {
> struct rv_monitor *p = mon;
>
> @@ -179,7 +177,7 @@ static void monitor_swap_reactors(struct
> rv_monitor *mon,
> list_for_each_entry_continue(p, &rv_monitors_list,
> list) {
> if (p->parent != mon)
> break;
> - monitor_swap_reactors_single(p, reactor,
> reacting, true);
> + monitor_swap_reactors_single(p, reactor,
> true);
> }
> /*
> * This call enables and disables the monitor if they were
> active.
> @@ -187,7 +185,7 @@ static void monitor_swap_reactors(struct
> rv_monitor *mon,
> * All nested monitors are enabled also if they were off, we
> may refine
> * this logic in the future.
> */
> - monitor_swap_reactors_single(mon, reactor, reacting, false);
> + monitor_swap_reactors_single(mon, reactor, false);
> }
>
> static ssize_t
> @@ -221,7 +219,7 @@ monitor_reactors_write(struct file *file, const
> char __user *user_buf,
>
> len = strlen(ptr);
> if (!len) {
> - monitor_swap_reactors(mon, NULL, false);
> + monitor_swap_reactors(mon, NULL);
> return count;
> }
>
> @@ -233,7 +231,7 @@ monitor_reactors_write(struct file *file, const
> char __user *user_buf,
> if (strcmp(ptr, reactor->name) != 0)
> continue;
>
> - monitor_swap_reactors(mon, reactor, true);
> + monitor_swap_reactors(mon, reactor);
>
> retval = count;
> break;
© 2016 - 2025 Red Hat, Inc.