From: Andreas Dilger <adilger@clusterfs.com>
Date: Wed, 30 Oct 2002 12:43:06 -0700
To: "Stephen C. Tweedie" <sct@redhat.com>, Andrew Morton <akpm@zip.com.au>
Cc: "Rusty's Trivial Patches" <trivial@rustcorp.com.au>
Subject: [PATCH] minor build fix for ext3 (2.4 and 2.5)

If you have ext2_fs.h and ext3_fs.h included at the same time,
we are missing one define used in ext3_should_journal_data() and
ext3_should_order_data() as part of the test_opt() macro (which
defaults to the ext2 definition if both are present).

Patch should apply to both 2.4 and 2.5 kernels without problems.

--- linux-2.4-ext3merge/include/linux/ext3_fs.h.=K0000=.orig	2003-03-13 16:22:34.000000000 +0000
+++ linux-2.4-ext3merge/include/linux/ext3_fs.h	2003-03-13 16:22:45.000000000 +0000
@@ -349,6 +349,7 @@ struct ext3_inode {
 #else
 #define EXT2_MOUNT_NOLOAD		EXT3_MOUNT_NOLOAD
 #define EXT2_MOUNT_ABORT		EXT3_MOUNT_ABORT
+#define EXT2_MOUNT_DATA_FLAGS		EXT3_MOUNT_DATA_FLAGS
 #endif
 
 #define ext3_set_bit			ext2_set_bit