switch omfs to ->evict_inode()

[net-next-2.6.git] / fs / omfs / inode.c

diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index 089839a6cc6404e46715df5543d4be0d9162c702..56121debc22b8f0e62a5524ac87af592aebbbee0 100644 (file)
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -175,9 +175,13 @@ int omfs_sync_inode(struct inode *inode)
  * called when an entry is deleted, need to clear the bits in the
  * bitmaps.
  */
-static void omfs_delete_inode(struct inode *inode)
+static void omfs_evict_inode(struct inode *inode)
 {
        truncate_inode_pages(&inode->i_data, 0);
+       end_writeback(inode);
+
+       if (inode->i_nlink)
+               return;
 
        if (S_ISREG(inode->i_mode)) {
                inode->i_size = 0;
@@ -185,7 +189,6 @@ static void omfs_delete_inode(struct inode *inode)
        }
 
        omfs_clear_range(inode->i_sb, inode->i_ino, 2);
-       clear_inode(inode);
 }
 
 struct inode *omfs_iget(struct super_block *sb, ino_t ino)
@@ -284,7 +287,7 @@ static int omfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 
 static const struct super_operations omfs_sops = {
        .write_inode    = omfs_write_inode,
-       .delete_inode   = omfs_delete_inode,
+       .evict_inode    = omfs_evict_inode,
        .put_super      = omfs_put_super,
        .statfs         = omfs_statfs,
        .show_options   = generic_show_options,