2 files changed, 3 insertions, 12 deletions

diff --git a/fs/freevxfs/vxfs_extern.h b/fs/freevxfs/vxfs_extern.h
index d8be917f9797..927acf70c591 100644
--- a/fs/freevxfs/vxfs_extern.h
+++ b/fs/freevxfs/vxfs_extern.h
@@ -38,7 +38,7 @@
  */
 
 
-struct kmem_cache_s;
+struct kmem_cache;
 struct super_block;
 struct vxfs_inode_info;
 struct inode;
@@ -51,7 +51,7 @@ extern daddr_t			vxfs_bmap1(struct inode *, long);
 extern int                      vxfs_read_fshead(struct super_block *);
 
 /* vxfs_inode.c */
-extern struct kmem_cache_s      *vxfs_inode_cachep;
+extern struct kmem_cache        *vxfs_inode_cachep;
 extern void                     vxfs_dumpi(struct vxfs_inode_info *, ino_t);
 extern struct inode *           vxfs_get_fake_inode(struct super_block *,
                                         struct vxfs_inode_info *);
diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c
index 9672d2facffe..f544aae9169f 100644
--- a/fs/freevxfs/vxfs_inode.c
+++ b/fs/freevxfs/vxfs_inode.c
@@ -46,15 +46,6 @@ extern struct address_space_operations vxfs_immed_aops;
 
 extern struct inode_operations vxfs_immed_symlink_iops;
 
-static struct file_operations vxfs_file_operations = {
-        .open =                 generic_file_open,
-        .llseek =               generic_file_llseek,
-        .read =                 generic_file_read,
-        .mmap =                 generic_file_mmap,
-        .sendfile =             generic_file_sendfile,
-};
-
-
 kmem_cache_t            *vxfs_inode_cachep;
 
 
@@ -318,7 +309,7 @@ vxfs_read_inode(struct inode *ip)
                 aops = &vxfs_aops;
 
         if (S_ISREG(ip->i_mode)) {
-                ip->i_fop = &vxfs_file_operations;
+                ip->i_fop = &generic_ro_fops;
                 ip->i_mapping->a_ops = aops;
         } else if (S_ISDIR(ip->i_mode)) {
                 ip->i_op = &vxfs_dir_inode_ops;