From 95ecc1ea7201a354ef457d7e4936038cc2bab8fb 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] --- yaml --- r: 163683 b: refs/heads/master c:
 3661d28615ea580c1db02a972fd4d3898df1cb01 h: refs/heads/master i:   163681:
 00cdfe2c34252a4c046384a9a745e3e9343c9ef3   163679:
 697e03ba1702cd13965c9020884e53b4c9a44f12 v: v3

---
 [refs]                            | 2 +-
 trunk/fs/ext4/super.c             | 1 +
 trunk/include/trace/events/ext4.h | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dc0ba0da9ab0..b65371bb8aee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ad9bb651fc2036ea94bed94da76a4b08959a911
+refs/heads/master: 3661d28615ea580c1db02a972fd4d3898df1cb01
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 04c693357336..af95dd8ba54b 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/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>
diff --git a/trunk/include/trace/events/ext4.h b/trunk/include/trace/events/ext4.h
index 68b53c7ef8a7..6fe6ce9ee071 100644
--- a/trunk/include/trace/events/ext4.h
+++ b/trunk/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),