hugetlb: use same fault hash key for shared and private mappings

[sfrench/cifs-2.6.git] / fs / squashfs / super.c

diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 40e657386fa52d9e0358ff45dd949dede645d4e0..767046d9f65d4b1fcb3cbfe42207fadc7a251f82 100644 (file)
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -473,18 +473,11 @@ static struct inode *squashfs_alloc_inode(struct super_block *sb)
 }
 
 
-static void squashfs_i_callback(struct rcu_head *head)
+static void squashfs_free_inode(struct inode *inode)
 {
-       struct inode *inode = container_of(head, struct inode, i_rcu);
        kmem_cache_free(squashfs_inode_cachep, squashfs_i(inode));
 }
 
-static void squashfs_destroy_inode(struct inode *inode)
-{
-       call_rcu(&inode->i_rcu, squashfs_i_callback);
-}
-
-
 static struct file_system_type squashfs_fs_type = {
        .owner = THIS_MODULE,
        .name = "squashfs",
@@ -496,7 +489,7 @@ MODULE_ALIAS_FS("squashfs");
 
 static const struct super_operations squashfs_super_ops = {
        .alloc_inode = squashfs_alloc_inode,
-       .destroy_inode = squashfs_destroy_inode,
+       .free_inode = squashfs_free_inode,
        .statfs = squashfs_statfs,
        .put_super = squashfs_put_super,
        .remount_fs = squashfs_remount