Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / fs / affs / affs.h

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index 7db2d287e9f39576c1d18d595988ddc87eb51843..d5bd497ab9cbd5154ade0781ed3bffbe3d83aeb7 100644 (file)
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -171,9 +171,11 @@ extern unsigned long                affs_parent_ino(struct inode *dir);
 extern struct inode            *affs_new_inode(struct inode *dir);
 extern int                      affs_notify_change(struct dentry *dentry, struct iattr *attr);
 extern void                     affs_put_inode(struct inode *inode);
+extern void                     affs_drop_inode(struct inode *inode);
 extern void                     affs_delete_inode(struct inode *inode);
 extern void                     affs_clear_inode(struct inode *inode);
-extern void                     affs_read_inode(struct inode *inode);
+extern struct inode            *affs_iget(struct super_block *sb,
+                                       unsigned long ino);
 extern int                      affs_write_inode(struct inode *inode, int);
 extern int                      affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s32 type);