Merge tag 'csky-for-linus-5.2-perf-unwind-libdw' of git://github.com/c-sky/csky-linux

[sfrench/cifs-2.6.git] / security / inode.c

diff --git a/security/inode.c b/security/inode.c
index 421dd72b5876720d70642f1d7d2d421a2e0d5e75..aacc4dabba7df9fcd62ff96d0fb57c0352b75412 100644 (file)
--- a/security/inode.c
+++ b/security/inode.c
@@ -27,22 +27,16 @@
 static struct vfsmount *mount;
 static int mount_count;
 
-static void securityfs_i_callback(struct rcu_head *head)
+static void securityfs_free_inode(struct inode *inode)
 {
-       struct inode *inode = container_of(head, struct inode, i_rcu);
        if (S_ISLNK(inode->i_mode))
                kfree(inode->i_link);
        free_inode_nonrcu(inode);
 }
 
-static void securityfs_destroy_inode(struct inode *inode)
-{
-       call_rcu(&inode->i_rcu, securityfs_i_callback);
-}
-
 static const struct super_operations securityfs_super_operations = {
        .statfs         = simple_statfs,
-       .destroy_inode  = securityfs_destroy_inode,
+       .free_inode     = securityfs_free_inode,
 };
 
 static int fill_super(struct super_block *sb, void *data, int silent)