--- ./include/linux/intermezzo_fs.h%IMZ	Wed Nov 27 14:35:59 2002
+++ ./include/linux/intermezzo_fs.h	Tue Dec  3 10:03:55 2002
@@ -58,6 +58,7 @@
 # include <linux/slab.h>
 # include <linux/vmalloc.h>
 # include <linux/smp_lock.h>
+# include <linux/limits.h>
 
 /* fixups for fs.h */
 # ifndef fs_down
--- ./fs/intermezzo/dir.c%IMZ	Wed Nov 27 14:35:53 2002
+++ ./fs/intermezzo/dir.c	Tue Dec  3 09:59:57 2002
@@ -356,10 +356,11 @@
                 CDEBUG(D_INODE, "presto_setattr: iattr is not valid\n");
 
         CDEBUG(D_INODE, "valid %#x, mode %#o, uid %u, gid %u, size %Lu, "
-               "atime %lu mtime %lu ctime %lu flags %d\n",
+               "atime %lu+%ld mtime %lu+%ld ctime %lu+%ld flags %d\n",
                iattr->ia_valid, iattr->ia_mode, iattr->ia_uid, iattr->ia_gid,
-               iattr->ia_size, iattr->ia_atime, iattr->ia_mtime,
-               iattr->ia_ctime, iattr->ia_attr_flags);
+               iattr->ia_size, iattr->ia_atime.tv_sec, iattr->ia_atime.tv_nsec,
+               iattr->ia_mtime.tv_sec, iattr->ia_mtime.tv_nsec,
+               iattr->ia_ctime.tv_sec, iattr->ia_ctime.tv_nsec, iattr->ia_attr_flags);
         
         if ( presto_get_permit(de->d_inode) < 0 ) {
                 EXIT;
--- ./fs/intermezzo/vfs.c%IMZ	Tue Dec  3 09:43:38 2002
+++ ./fs/intermezzo/vfs.c	Tue Dec  3 10:08:35 2002
@@ -187,7 +187,9 @@
 
         if (errorval && errorval == (long)value && !is_read_only(dev)) {
                 CDEBUG(D_SUPER, "setting device %s read only\n", kdevname(dev));
+#if 0 /* FIXME: DEBUG only */
                 BLKDEV_FAIL(dev, 1);
+#endif
                 izo_channels[minor].uc_errorval = -kdev_val(dev);
         }
 }
--- ./fs/intermezzo/replicator.c%IMZ	Wed Nov 27 14:36:03 2002
+++ ./fs/intermezzo/replicator.c	Tue Dec  3 10:18:56 2002
@@ -29,7 +29,7 @@
 #include <asm/uaccess.h>
 
 #include <linux/errno.h>
-
+#include <linux/fs.h>
 #include <linux/intermezzo_fs.h>
 
 /*