From 27afa27d670380af1a5dee3a7bb123a6cce2b87c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 15 Apr 2019 22:33:06 -0400 Subject: apparmor: switch to ->free_inode() Signed-off-by: Al Viro --- security/apparmor/apparmorfs.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'security') diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index b9298d2e8165..9ab5613fe07c 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -123,22 +123,16 @@ static int aafs_show_path(struct seq_file *seq, struct dentry *dentry) return 0; } -static void aafs_i_callback(struct rcu_head *head) +static void aafs_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 aafs_destroy_inode(struct inode *inode) -{ - call_rcu(&inode->i_rcu, aafs_i_callback); -} - static const struct super_operations aafs_super_ops = { .statfs = simple_statfs, - .destroy_inode = aafs_destroy_inode, + .free_inode = aafs_free_inode, .show_path = aafs_show_path, }; -- cgit v1.2.3 From f614ee1e3ea7ac155f827294fccb4816552c99ec Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 15 Apr 2019 22:34:28 -0400 Subject: securityfs: switch to ->free_inode() Signed-off-by: Al Viro --- security/inode.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'security') diff --git a/security/inode.c b/security/inode.c index 421dd72b5876..aacc4dabba7d 100644 --- 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) -- cgit v1.2.3