diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-05 05:09:46 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-05 05:09:46 +0000 |
| commit | 72f582ff8569900ccc4439b26bbe5e2fff509f08 (patch) | |
| tree | cc84085b70b78d1329a0f9ed6045221e736d5912 /kernel/trace/trace.c | |
| parent | bddea11b1b9385f713006820f16a9fbe5efe6b47 (diff) | |
| parent | a3d1e7eb5abe3aa1095bc75d1a6760d3809bd672 (diff) | |
| download | lwn-72f582ff8569900ccc4439b26bbe5e2fff509f08.tar.gz lwn-72f582ff8569900ccc4439b26bbe5e2fff509f08.zip | |
Merge branch 'work.recursive_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs recursive removal updates from Al Viro:
"We have quite a few places where synthetic filesystems do an
equivalent of 'rm -rf', with varying amounts of code duplication,
wrong locking, etc. That really ought to be a library helper.
Only debugfs (and very similar tracefs) are converted here - I have
more conversions, but they'd never been in -next, so they'll have to
wait"
* 'work.recursive_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
simple_recursive_removal(): kernel-side rm -rf for ramfs-style filesystems
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 5b6ee4aadc26..5e02d65505c1 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8504,7 +8504,7 @@ static struct trace_array *trace_array_create(const char *name) ret = event_trace_add_tracer(tr->dir, tr); if (ret) { - tracefs_remove_recursive(tr->dir); + tracefs_remove(tr->dir); goto out_free_tr; } @@ -8613,7 +8613,7 @@ static int __remove_instance(struct trace_array *tr) event_trace_del_tracer(tr); ftrace_clear_pids(tr); ftrace_destroy_function_files(tr); - tracefs_remove_recursive(tr->dir); + tracefs_remove(tr->dir); free_trace_buffers(tr); for (i = 0; i < tr->nr_topts; i++) { |