| From b27c27c1ae02b5ad2b96ec0043822270a980717d Mon Sep 17 00:00:00 2001 |
| From: Theodore Ts'o <tytso@mit.edu> |
| Date: Mon, 14 Sep 2009 22:59:50 -0400 |
| Subject: [PATCH 30/85] ext4: Fix include/trace/events/ext4.h to work with Systemtap |
| |
| (cherry picked from commit 3661d28615ea580c1db02a972fd4d3898df1cb01) |
| |
| Using relative pathnames in #include statements interacts badly with |
| SystemTap, since the fs/ext4/*.h header files are not packaged up as |
| part of a distribution kernel's header files. Since systemtap doesn't |
| use TP_fast_assign(), we can use a blind structure definition and then |
| make sure the needed header files are defined before the ext4 source |
| files #include the trace/events/ext4.h header file. |
| |
| https://bugzilla.redhat.com/show_bug.cgi?id=512478 |
| |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/ext4/super.c | 1 + |
| include/trace/events/ext4.h | 6 ++++-- |
| 2 files changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/fs/ext4/super.c |
| +++ b/fs/ext4/super.c |
| @@ -45,6 +45,7 @@ |
| #include "ext4_jbd2.h" |
| #include "xattr.h" |
| #include "acl.h" |
| +#include "mballoc.h" |
| |
| #define CREATE_TRACE_POINTS |
| #include <trace/events/ext4.h> |
| --- a/include/trace/events/ext4.h |
| +++ b/include/trace/events/ext4.h |
| @@ -5,10 +5,12 @@ |
| #define _TRACE_EXT4_H |
| |
| #include <linux/writeback.h> |
| -#include "../../../fs/ext4/ext4.h" |
| -#include "../../../fs/ext4/mballoc.h" |
| #include <linux/tracepoint.h> |
| |
| +struct ext4_allocation_context; |
| +struct ext4_allocation_request; |
| +struct ext4_prealloc_space; |
| + |
| TRACE_EVENT(ext4_free_inode, |
| TP_PROTO(struct inode *inode), |
| |
