diff -uNr -Xdontdiff -p linux-2.4.19/fs/intermezzo/journal_xfs.c linux-2.4-xfs/fs/intermezzo/journal_xfs.c
--- linux-2.4.19/fs/intermezzo/journal_xfs.c	Thu Sep  5 13:40:35 2002
+++ linux-2.4-xfs/fs/intermezzo/journal_xfs.c	Fri Nov 16 23:21:00 2001
@@ -15,6 +15,8 @@
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
+#if 0
+/* XFS support not there yet... */
 #ifdef CONFIG_FS_XFS
 #include <linux/xfs_fs.h>
 #endif
@@ -133,5 +135,5 @@ struct journal_ops presto_xfs_journal_op
 };
 
 #endif /* CONFIG_XFS_FS */
-
+#endif /* 0 */
 
diff -uNr -Xdontdiff -p linux-2.4.19/fs/intermezzo/vfs.c linux-2.4-xfs/fs/intermezzo/vfs.c
--- linux-2.4.19/fs/intermezzo/vfs.c	Thu Sep  5 13:41:18 2002
+++ linux-2.4-xfs/fs/intermezzo/vfs.c	Thu Aug  1 12:24:24 2002
@@ -55,7 +55,7 @@
 #ifdef CONFIG_FS_EXT_ATTR
 #include <linux/ext_attr.h>
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
 #include <linux/posix_acl.h>
 #endif
 #endif
@@ -317,7 +317,7 @@ int lento_setattr(const char *name, stru
         struct dentry *dentry;
         struct presto_file_set *fset;
         int error;
-#ifdef  CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
         int (*set_posix_acl)(struct inode *, int type, posix_acl_t *)=NULL;
 #endif
 
@@ -358,7 +358,7 @@ int lento_setattr(const char *name, stru
                                  (dentry->d_inode->i_mode & ~S_IALLUGO);
                 CDEBUG(D_PIOCTL, "chmod: orig %#o, set %#o, result %#o\n",
                        dentry->d_inode->i_mode, set_mode, iattr->ia_mode);
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
                 /* ACl code interacts badly with setattr 
                  * since it tries to modify the ACL using 
                  * set_ext_attr which recurses back into presto.  
@@ -378,7 +378,7 @@ int lento_setattr(const char *name, stru
 
         error = presto_do_setattr(fset, dentry, iattr, info);
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
         /* restore the inode_operations if we changed them*/
         if (iattr->ia_valid & ATTR_MODE) 
                 dentry->d_inode->i_op->set_posix_acl=set_posix_acl;
@@ -2129,7 +2129,7 @@ exit:
 
 #ifdef CONFIG_FS_EXT_ATTR
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
 /* Posix ACL code changes i_mode without using a notify_change (or
  * a mark_inode_dirty!). We need to duplicate this at the reintegrator
  * which is done by this function. This function also takes care of 
@@ -2272,7 +2272,7 @@ int presto_do_set_ext_attr(struct presto
                 goto exit;
         }
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
         /* Reset mode if specified*/
         /* XXX: when we do native acl support, move this code out! */
         if (mode != NULL) {