summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_events.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-11-18 09:43:10 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2019-12-10 22:29:58 -0500
commita3d1e7eb5abe3aa1095bc75d1a6760d3809bd672 (patch)
tree1dce9bdc1052f0a94dffe67526e38f5a8202164f /kernel/trace/trace_events.c
parente42617b825f8073569da76dc4510bfa019b1c35a (diff)
downloadlinux-stable-a3d1e7eb5abe3aa1095bc75d1a6760d3809bd672.tar.gz
linux-stable-a3d1e7eb5abe3aa1095bc75d1a6760d3809bd672.tar.bz2
linux-stable-a3d1e7eb5abe3aa1095bc75d1a6760d3809bd672.zip
simple_recursive_removal(): kernel-side rm -rf for ramfs-style filesystems
two requirements: no file creations in IS_DEADDIR and no cross-directory renames whatsoever. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/trace/trace_events.c')
-rw-r--r--kernel/trace/trace_events.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index c6de3cebc127..1faf3a1e24a4 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -697,7 +697,7 @@ static void remove_subsystem(struct trace_subsystem_dir *dir)
return;
if (!--dir->nr_events) {
- tracefs_remove_recursive(dir->entry);
+ tracefs_remove(dir->entry);
list_del(&dir->list);
__put_system_dir(dir);
}
@@ -716,7 +716,7 @@ static void remove_event_file_dir(struct trace_event_file *file)
}
spin_unlock(&dir->d_lock);
- tracefs_remove_recursive(dir);
+ tracefs_remove(dir);
}
list_del(&file->list);
@@ -3064,7 +3064,7 @@ int event_trace_del_tracer(struct trace_array *tr)
down_write(&trace_event_sem);
__trace_remove_event_dirs(tr);
- tracefs_remove_recursive(tr->event_dir);
+ tracefs_remove(tr->event_dir);
up_write(&trace_event_sem);
tr->event_dir = NULL;