trace-cmd reset: Fix -d option

Commit Message

Steven Rostedt Jan. 10, 2024, 4:17 a.m. UTC

From: "Steven Rostedt (Google)" <[e-mail]>

There was a bug where a "trace-cmd record -B foo" would delete the foo
instance when the record was finished even if that instance previously
existed. But that fix was a bit too agreesive. It changed two places:

1) where the bug was, in remove_instance()

2) where the bug was not, in tracecmd_remove_instance() that uses the
instance->flags to know if it should be deleted or not.

The "trace-cmd reset" uses the latter function and if the "-d" option is
set, it is supposed to delete the instance. But because that function was
changed to only delete it if it created it (which reset does not do), it
broke it.

Fixes: 9d6f3baa3 ("trace-cmd record/extract: Do not destroy existing instances")
Signed-off-by: Steven Rostedt (Google) <[e-mail]>
---
 tracecmd/trace-record.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 16b73776..3114a664 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -5419,8 +5419,7 @@  void tracecmd_remove_instances(void)
 			close(instance->tracing_on_fd);
 			instance->tracing_on_fd = 0;
 		}
-		if (tracefs_instance_is_new(instance->tracefs))
-			tracefs_instance_destroy(instance->tracefs);
+		tracefs_instance_destroy(instance->tracefs);
 	}
 }