ntfs: switch to ->free_inode()

move the synchronous stuff from ->destroy_inode() to ->evict_inode(),
turn the RCU-delayed part into ->free_inode()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 4 insertions, 13 deletions

diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index bd3221cbdd95..fb1a2b49a5da 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -332,23 +332,11 @@ struct inode *ntfs_alloc_big_inode(struct super_block *sb)
         return NULL;
 }
 
-static void ntfs_i_callback(struct rcu_head *head)
+void ntfs_free_big_inode(struct inode *inode)
 {
-        struct inode *inode = container_of(head, struct inode, i_rcu);
         kmem_cache_free(ntfs_big_inode_cache, NTFS_I(inode));
 }
 
-void ntfs_destroy_big_inode(struct inode *inode)
-{
-        ntfs_inode *ni = NTFS_I(inode);
-
-        ntfs_debug("Entering.");
-        BUG_ON(ni->page);
-        if (!atomic_dec_and_test(&ni->count))
-                BUG();
-        call_rcu(&inode->i_rcu, ntfs_i_callback);
-}
-
 static inline ntfs_inode *ntfs_alloc_extent_inode(void)
 {
         ntfs_inode *ni;
@@ -2287,6 +2275,9 @@ void ntfs_evict_big_inode(struct inode *vi)
                         ni->ext.base_ntfs_ino = NULL;
                 }
         }
+        BUG_ON(ni->page);
+        if (!atomic_dec_and_test(&ni->count))
+                BUG();
         return;
 }