An incomplete merge prevented this file from being properly compiled.

This snuck by because the file is not part of the regular PlanetLab kernel.

I am now building the non-planetlab kernel for my laptop, which includes a
bunch more stuff.  My hope is that we gain better coverage this way.

diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 022cd18..fd0f53d 100644 (file)
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -170,7 +170,6 @@ ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 
        *ppos = pos;
 
-       if (!IS_RDONLY(inode) || (file && MNT_IS_RDONLY(file->f_vfsmnt))) {
        file_accessed(file);
 
        DPRINTK("ncp_file_read: exit %s/%s\n",
@@ -263,7 +262,7 @@ ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *
        }
        vfree(bouncebuffer);
 
-       inode_update_time(inode, 1);
+       inode_update_time(inode, file->f_vfsmnt, 1); /* Both mtime and ctime */
 
        *ppos = pos;