patch-2.1.89 linux/fs/coda/file.c

• Lines: 85
• Date: Wed Mar 4 15:14:32 1998
• Orig file: v2.1.88/linux/fs/coda/file.c
• Orig date: Thu Feb 12 20:56:11 1998

diff -u --recursive --new-file v2.1.88/linux/fs/coda/file.c linux/fs/coda/file.c
@@ -20,12 +20,12 @@
 
 #include <linux/coda.h>
 #include <linux/coda_linux.h>
-#include <linux/coda_cnode.h>
+#include <linux/coda_fs_i.h>
 #include <linux/coda_psdev.h>
 #include <linux/coda_cache.h>
 
 /* file operations */
-static int coda_readpage(struct dentry * dentry, struct page * page);
+static int coda_readpage(struct file *file, struct page * page);
 static ssize_t coda_file_read(struct file *f, char *buf, size_t count, loff_t *off);
 static ssize_t coda_file_write(struct file *f, const char *buf, size_t count, loff_t *off);
 static int coda_file_mmap(struct file * file, struct vm_area_struct * vma);
@@ -74,12 +74,13 @@
 };
 
 /*  File file operations */
-static int coda_readpage(struct dentry *de, struct page * page)
+static int coda_readpage(struct file * file, struct page * page)
 {
+	struct dentry *de = file->f_dentry;
 	struct inode *inode = de->d_inode;
 	struct dentry cont_dentry;
         struct inode *cont_inode;
-        struct cnode *cnp;
+        struct coda_inode_info *cnp;
 
         ENTRY;
         
@@ -103,7 +104,7 @@
 
 static int coda_file_mmap(struct file * file, struct vm_area_struct * vma)
 {
-        struct cnode *cnp;
+        struct coda_inode_info *cnp;
 	cnp = ITOC(file->f_dentry->d_inode);
 	cnp->c_mmcount++;
   
@@ -113,7 +114,7 @@
 static ssize_t coda_file_read(struct file *coda_file, char *buff, 
 			   size_t count, loff_t *ppos)
 {
-        struct cnode *cnp;
+        struct coda_inode_info *cnp;
 	struct inode *coda_inode = coda_file->f_dentry->d_inode;
         struct inode *cont_inode = NULL;
         struct file  cont_file;
@@ -153,7 +154,7 @@
 static ssize_t coda_file_write(struct file *coda_file, const char *buff, 
 			    size_t count, loff_t *ppos)
 {
-        struct cnode *cnp;
+        struct coda_inode_info *cnp;
 	struct inode *coda_inode = coda_file->f_dentry->d_inode;
         struct inode *cont_inode = NULL;
         struct file  cont_file;
@@ -192,7 +193,7 @@
 
 int coda_fsync(struct file *coda_file, struct dentry *coda_dentry)
 {
-        struct cnode *cnp;
+        struct coda_inode_info *cnp;
 	struct inode *coda_inode = coda_dentry->d_inode;
         struct inode *cont_inode = NULL;
         struct file  cont_file;
@@ -254,7 +255,7 @@
 {
         coda_file->f_pos = open_file->f_pos;
 	/* XXX what about setting the mtime here too? */
-	coda_inode->i_mtime = open_inode->i_mtime;
+	/* coda_inode->i_mtime = open_inode->i_mtime; */
 	coda_inode->i_size = open_inode->i_size;
         return;
 }
@@ -264,7 +265,7 @@
 {
         struct super_block *sbptr;
 
-        sbptr = get_super(to_kdev_t(dev));
+        sbptr = get_super(dev);
 
         if ( !sbptr ) {
                 printk("coda_inode_grab: coda_find_super returns NULL.\n");