FYI, I updated the mballoc-core patch in the ext4-patch-queue to not try
to pull in both ext4_jbd2.h and jbd.h; this was causing duplicate
definition, so I removed the #include of jbd.h
- Ted
Remove #include of linux/jbd.h from mballoc-core so it will compile
diff --git a/mballoc-core.patch b/mballoc-core.patch
index b8839b4..1079692 100644
--- a/mballoc-core.patch
+++ b/mballoc-core.patch
@@ -357,7 +357,7 @@ Index: linux-2.6.23-rc6/fs/ext4/mballoc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.23-rc6/fs/ext4/mballoc.c 2007-09-20 17:26:22.000000000 -0700
-@@ -0,0 +1,4460 @@
+@@ -0,0 +1,4459 @@
+/*
+ * Copyright (c) 2003-2006, Cluster File Systems, Inc, [email protected]
+ * Written by Alex Tomas <[email protected]>
@@ -385,7 +385,6 @@ Index: linux-2.6.23-rc6/fs/ext4/mballoc.c
+#include <linux/fs.h>
+#include <linux/namei.h>
+#include <linux/ext4_jbd2.h>
-+#include <linux/jbd.h>
+#include <linux/ext4_fs.h>
+#include <linux/quotaops.h>
+#include <linux/buffer_head.h>