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/qnx4/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/qnx4/inode.c')
-rw-r--r-- | fs/qnx4/inode.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index fcada42f1aa3..e63b4171d583 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -425,11 +425,18 @@ static struct inode *qnx4_alloc_inode(struct super_block *sb) | |||
425 | return &ei->vfs_inode; | 425 | return &ei->vfs_inode; |
426 | } | 426 | } |
427 | 427 | ||
428 | static void qnx4_destroy_inode(struct inode *inode) | 428 | static void qnx4_i_callback(struct rcu_head *head) |
429 | { | 429 | { |
430 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
431 | INIT_LIST_HEAD(&inode->i_dentry); | ||
430 | kmem_cache_free(qnx4_inode_cachep, qnx4_i(inode)); | 432 | kmem_cache_free(qnx4_inode_cachep, qnx4_i(inode)); |
431 | } | 433 | } |
432 | 434 | ||
435 | static void qnx4_destroy_inode(struct inode *inode) | ||
436 | { | ||
437 | call_rcu(&inode->i_rcu, qnx4_i_callback); | ||
438 | } | ||
439 | |||
433 | static void init_once(void *foo) | 440 | static void init_once(void *foo) |
434 | { | 441 | { |
435 | struct qnx4_inode_info *ei = (struct qnx4_inode_info *) foo; | 442 | struct qnx4_inode_info *ei = (struct qnx4_inode_info *) foo; |