diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-31 10:55:42 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-31 10:55:42 +1100 |
commit | 46491588c6335cbc71ca660d9feb2c0d4f0f6401 (patch) | |
tree | 7f650ddd7b6e934c63332b75b0cd598006a714a9 /fs/logfs/inode.c | |
parent | d4a2c96152ed0290c0d6c7791f5315b2f01105ff (diff) | |
parent | 6245d166245845e40bd290b0df1ae99a2d5bbf63 (diff) |
Merge remote branch 'vfs-scale/vfs-scale-working'
Conflicts:
Documentation/filesystems/Locking
fs/cifs/dir.c
fs/fuse/inode.c
fs/hfsplus/hfsplus_fs.h
fs/hfsplus/unicode.c
Diffstat (limited to 'fs/logfs/inode.c')
-rw-r--r-- | fs/logfs/inode.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c index d8c71ece098f..03b8c240aeda 100644 --- a/fs/logfs/inode.c +++ b/fs/logfs/inode.c @@ -141,13 +141,20 @@ struct inode *logfs_safe_iget(struct super_block *sb, ino_t ino, int *is_cached) return __logfs_iget(sb, ino); } +static void logfs_i_callback(struct rcu_head *head) +{ + struct inode *inode = container_of(head, struct inode, i_rcu); + INIT_LIST_HEAD(&inode->i_dentry); + kmem_cache_free(logfs_inode_cache, logfs_inode(inode)); +} + static void __logfs_destroy_inode(struct inode *inode) { struct logfs_inode *li = logfs_inode(inode); BUG_ON(li->li_block); list_del(&li->li_freeing_list); - kmem_cache_free(logfs_inode_cache, li); + call_rcu(&inode->i_rcu, logfs_i_callback); } static void logfs_destroy_inode(struct inode *inode) |