From: "Theodore Ts'o" <tytso@mit.edu>
To: Alex Tomas <alex@clusterfs.com>, Andreas Dilger <adilger@clusterfs.com>
Cc: linux-ext4@vger.kernel.org
Subject: mballoc-core
Date: Mon, 24 Sep 2007 10:11:05 -0400 [thread overview]
Message-ID: <E1IZoeP-0002H7-Sf@tinytim.thunk.org> (raw)
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, info@clusterfs.com
+ * Written by Alex Tomas <alex@clusterfs.com>
@@ -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>
reply other threads:[~2007-09-24 14:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1IZoeP-0002H7-Sf@tinytim.thunk.org \
--to=tytso@mit.edu \
--cc=adilger@clusterfs.com \
--cc=alex@clusterfs.com \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).