summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorPeter Enderborg <peter.enderborg@sony.com>2020-07-16 09:15:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-23 17:10:25 +0200
commit072e133d554bb74929f902582c8cf66d9fd12771 (patch)
tree4599755e761dc9ca67d99c687d6d062cdc0e9547 /kernel/trace/trace.c
parentb292b50b0efcc7095d8bf15505fba6909bb35dce (diff)
downloadlinux-stable-072e133d554bb74929f902582c8cf66d9fd12771.tar.gz
linux-stable-072e133d554bb74929f902582c8cf66d9fd12771.tar.bz2
linux-stable-072e133d554bb74929f902582c8cf66d9fd12771.zip
tracefs: Remove unnecessary debug_fs checks.
This is a preparation for debugfs restricted mode. We don't need debugfs to trace, the removed check stop tracefs to work if debugfs is not initialised. We instead tries to automount within debugfs and relay on it's handling. The code path is to create a backward compatibility from when tracefs was part of debugfs, it is now standalone and does not need debugfs. When debugfs is in restricted it is compiled in but not active and return EPERM to clients and tracefs wont work if it assumes it is active it is compiled in kernel. Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Peter Enderborg <peter.enderborg@sony.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Link: https://lore.kernel.org/r/20200716071511.26864-2-peter.enderborg@sony.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index bb62269724d5..848f67a5f16d 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -8945,9 +8945,7 @@ struct dentry *tracing_init_dentry(void)
if (tr->dir)
return NULL;
- if (WARN_ON(!tracefs_initialized()) ||
- (IS_ENABLED(CONFIG_DEBUG_FS) &&
- WARN_ON(!debugfs_initialized())))
+ if (WARN_ON(!tracefs_initialized()))
return ERR_PTR(-ENODEV);
/*