diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 11:56:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 11:56:33 -0500 |
| commit | b4a45f5fe8078bfc10837dbd5b98735058bc4698 (patch) | |
| tree | df6f13a27610a3ec7eb4a661448cd779a8f84c79 /fs/logfs/inode.c | |
| parent | 01539ba2a706ab7d35fc0667dff919ade7f87d63 (diff) | |
| parent | b3e19d924b6eaf2ca7d22cba99a517c5171007b6 (diff) | |
Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
* 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: (57 commits)
fs: scale mntget/mntput
fs: rename vfsmount counter helpers
fs: implement faster dentry memcmp
fs: prefetch inode data in dcache lookup
fs: improve scalability of pseudo filesystems
fs: dcache per-inode inode alias locking
fs: dcache per-bucket dcache hash locking
bit_spinlock: add required includes
kernel: add bl_list
xfs: provide simple rcu-walk ACL implementation
btrfs: provide simple rcu-walk ACL implementation
ext2,3,4: provide simple rcu-walk ACL implementation
fs: provide simple rcu-walk generic_check_acl implementation
fs: provide rcu-walk aware permission i_ops
fs: rcu-walk aware d_revalidate method
fs: cache optimise dentry and inode for rcu-walk
fs: dcache reduce branches in lookup path
fs: dcache remove d_mounted
fs: fs_struct use seqlock
fs: rcu-walk for path lookup
...
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) | |||
| 141 | return __logfs_iget(sb, ino); | 141 | return __logfs_iget(sb, ino); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static void logfs_i_callback(struct rcu_head *head) | ||
| 145 | { | ||
| 146 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
| 147 | INIT_LIST_HEAD(&inode->i_dentry); | ||
| 148 | kmem_cache_free(logfs_inode_cache, logfs_inode(inode)); | ||
| 149 | } | ||
| 150 | |||
| 144 | static void __logfs_destroy_inode(struct inode *inode) | 151 | static void __logfs_destroy_inode(struct inode *inode) |
| 145 | { | 152 | { |
| 146 | struct logfs_inode *li = logfs_inode(inode); | 153 | struct logfs_inode *li = logfs_inode(inode); |
| 147 | 154 | ||
| 148 | BUG_ON(li->li_block); | 155 | BUG_ON(li->li_block); |
| 149 | list_del(&li->li_freeing_list); | 156 | list_del(&li->li_freeing_list); |
| 150 | kmem_cache_free(logfs_inode_cache, li); | 157 | call_rcu(&inode->i_rcu, logfs_i_callback); |
| 151 | } | 158 | } |
| 152 | 159 | ||
| 153 | static void logfs_destroy_inode(struct inode *inode) | 160 | static void logfs_destroy_inode(struct inode *inode) |
