Skip to content

Commit 3f3c73d

Browse files
torvaldstorvalds
committed
Merge tag 'trace-4.1-tracefs' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracefs from Steven Rostedt: "This adds the new tracefs file system. This has been in linux-next for more than one release, as I had it ready for the 4.0 merge window, but a last minute thing that needed to go into Linux first had to be done. That was that perf hard coded the file system number when reading /sys/kernel/debugfs/tracing directory making sure that the path had the debugfs mount # before it would parse the tracing file. This broke other use cases of perf, and the check is removed. Now when mounting /sys/kernel/debug, tracefs is automatically mounted in /sys/kernel/debug/tracing such that old tools will still see that path as expected. But now system admins can mount tracefs directly and not need to mount debugfs, which can expose security issues. A new directory is created when tracefs is configured such that system admins can now mount it separately (/sys/kernel/tracing)" * tag 'trace-4.1-tracefs' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Have mkdir and rmdir be part of tracefs tracefs: Add directory /sys/kernel/tracing tracing: Automatically mount tracefs on debugfs/tracing tracing: Convert the tracing facility over to use tracefs tracefs: Add new tracefs file system tracing: Create cmdline tracer options on tracing fs init tracing: Only create tracer options files if directory exists debugfs: Provide a file creation function that also takes an initial size
2 parents 9497d73 + eae4735 commit 3f3c73d

File tree

13 files changed

+832
-142
lines changed

13 files changed

+832
-142
lines changed

‎fs/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ obj-$(CONFIG_HOSTFS) += hostfs/
118118
obj-$(CONFIG_HPPFS) += hppfs/
119119
obj-$(CONFIG_CACHEFILES) += cachefiles/
120120
obj-$(CONFIG_DEBUG_FS) += debugfs/
121+
obj-$(CONFIG_TRACING) += tracefs/
121122
obj-$(CONFIG_OCFS2_FS) += ocfs2/
122123
obj-$(CONFIG_BTRFS_FS) += btrfs/
123124
obj-$(CONFIG_GFS2_FS) += gfs2/

‎fs/tracefs/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tracefs-objs := inode.o
2+
3+
obj-$(CONFIG_TRACING) += tracefs.o
4+

0 commit comments

Comments
 (0)