Ok, looks like intermezzo+xfs isn't ready for prime-time yet. This is
going into the next spin, it should fix your compile for now... just
#defines away xfs support in intermezzo.
-Eric
--- linux/fs/intermezzo/methods.c.orig 2001/09/07 23:21:03 1.13
+++ linux/fs/intermezzo/methods.c 2001/10/26 19:29:23
@@ -163,7 +163,8 @@
if ( strlen(cache_type) == strlen("xfs") &&
memcmp(cache_type, "xfs", strlen("xfs")) == 0 ) {
-#if defined(CONFIG_XFS_FS) || defined (CONFIG_XFS_FS_MODULE)
+#if 0
+/*#if defined(CONFIG_XFS_FS) || defined (CONFIG_XFS_FS_MODULE) */
ops->o_trops = &presto_xfs_journal_ops;
#else
ops->o_trops = NULL;
--- linux/fs/intermezzo/journal_xfs.c.orig 2001/09/20 15:43:20 1.6
+++ linux/fs/intermezzo/journal_xfs.c 2001/10/26 19:29:23
@@ -15,6 +15,7 @@
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <linux/string.h>
+#if 0
#ifdef CONFIG_FS_XFS
#include <linux/xfs_fs.h>
#endif
@@ -139,6 +140,8 @@
tr_journal_data: presto_xfs_journal_file_data
};
-#endif /* CONFIG_XFS_FS */
+#endif
+
+#endif /* CONFIG_XFS_FS */
--
Eric Sandeen XFS for Linux http://oss.sgi.com/projects/xfs
sandeen@xxxxxxx SGI, Inc.
|