diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2019-04-10 14:12:44 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-04-10 14:12:44 -0400 |
commit | ad7999cd701e4e058765d35cf5274ee16801e986 (patch) | |
tree | 61e746c47dc7da004eeafd279d24b31dfc536d31 /security/apparmor/apparmorfs.c | |
parent | 15ade5d2e7775667cf191cf2f94327a4889f8b9d (diff) | |
parent | f51dcd0f621caac5380ce90fbbeafc32ce4517ae (diff) | |
download | linux-stable-ad7999cd701e4e058765d35cf5274ee16801e986.tar.gz linux-stable-ad7999cd701e4e058765d35cf5274ee16801e986.tar.bz2 linux-stable-ad7999cd701e4e058765d35cf5274ee16801e986.zip |
Merge branch 'fixes' into work.icache
Diffstat (limited to 'security/apparmor/apparmorfs.c')
-rw-r--r-- | security/apparmor/apparmorfs.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index fefee040bf79..b9298d2e8165 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -123,17 +123,22 @@ static int aafs_show_path(struct seq_file *seq, struct dentry *dentry) return 0; } -static void aafs_evict_inode(struct inode *inode) +static void aafs_i_callback(struct rcu_head *head) { - truncate_inode_pages_final(&inode->i_data); - clear_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, - .evict_inode = aafs_evict_inode, + .destroy_inode = aafs_destroy_inode, .show_path = aafs_show_path, }; |