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/hppfs/hppfs.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/hppfs/hppfs.c')
-rw-r--r-- | fs/hppfs/hppfs.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c index f702b5f713fc..87ed48e0343d 100644 --- a/fs/hppfs/hppfs.c +++ b/fs/hppfs/hppfs.c | |||
@@ -632,11 +632,18 @@ void hppfs_evict_inode(struct inode *ino) | |||
632 | mntput(ino->i_sb->s_fs_info); | 632 | mntput(ino->i_sb->s_fs_info); |
633 | } | 633 | } |
634 | 634 | ||
635 | static void hppfs_destroy_inode(struct inode *inode) | 635 | static void hppfs_i_callback(struct rcu_head *head) |
636 | { | 636 | { |
637 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
638 | INIT_LIST_HEAD(&inode->i_dentry); | ||
637 | kfree(HPPFS_I(inode)); | 639 | kfree(HPPFS_I(inode)); |
638 | } | 640 | } |
639 | 641 | ||
642 | static void hppfs_destroy_inode(struct inode *inode) | ||
643 | { | ||
644 | call_rcu(&inode->i_rcu, hppfs_i_callback); | ||
645 | } | ||
646 | |||
640 | static const struct super_operations hppfs_sbops = { | 647 | static const struct super_operations hppfs_sbops = { |
641 | .alloc_inode = hppfs_alloc_inode, | 648 | .alloc_inode = hppfs_alloc_inode, |
642 | .destroy_inode = hppfs_destroy_inode, | 649 | .destroy_inode = hppfs_destroy_inode, |