Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[~andy/linux] / fs / freevxfs / vxfs_extern.h

diff --git a/fs/freevxfs/vxfs_extern.h b/fs/freevxfs/vxfs_extern.h
index 1cf1fe8466a2c9f0efbb28e06e3cfe0c4f21c99e..2b46064f66b2ed1a393ef9729253f59d90115c06 100644 (file)
--- a/fs/freevxfs/vxfs_extern.h
+++ b/fs/freevxfs/vxfs_extern.h
@@ -58,11 +58,11 @@ extern struct inode *               vxfs_get_fake_inode(struct super_block *,
 extern void                    vxfs_put_fake_inode(struct inode *);
 extern struct vxfs_inode_info *        vxfs_blkiget(struct super_block *, u_long, ino_t);
 extern struct vxfs_inode_info *        vxfs_stiget(struct super_block *, ino_t);
-extern void                    vxfs_read_inode(struct inode *);
+extern struct inode *          vxfs_iget(struct super_block *, ino_t);
 extern void                    vxfs_clear_inode(struct inode *);
 
 /* vxfs_lookup.c */
-extern struct inode_operations vxfs_dir_inode_ops;
+extern const struct inode_operations   vxfs_dir_inode_ops;
 extern const struct file_operations    vxfs_dir_operations;
 
 /* vxfs_olt.c */