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/ntfs/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/ntfs/inode.c')
-rw-r--r-- | fs/ntfs/inode.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index 93622b175fc7..a627ed82c0a3 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c | |||
@@ -332,6 +332,13 @@ struct inode *ntfs_alloc_big_inode(struct super_block *sb) | |||
332 | return NULL; | 332 | return NULL; |
333 | } | 333 | } |
334 | 334 | ||
335 | static void ntfs_i_callback(struct rcu_head *head) | ||
336 | { | ||
337 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
338 | INIT_LIST_HEAD(&inode->i_dentry); | ||
339 | kmem_cache_free(ntfs_big_inode_cache, NTFS_I(inode)); | ||
340 | } | ||
341 | |||
335 | void ntfs_destroy_big_inode(struct inode *inode) | 342 | void ntfs_destroy_big_inode(struct inode *inode) |
336 | { | 343 | { |
337 | ntfs_inode *ni = NTFS_I(inode); | 344 | ntfs_inode *ni = NTFS_I(inode); |
@@ -340,7 +347,7 @@ void ntfs_destroy_big_inode(struct inode *inode) | |||
340 | BUG_ON(ni->page); | 347 | BUG_ON(ni->page); |
341 | if (!atomic_dec_and_test(&ni->count)) | 348 | if (!atomic_dec_and_test(&ni->count)) |
342 | BUG(); | 349 | BUG(); |
343 | kmem_cache_free(ntfs_big_inode_cache, NTFS_I(inode)); | 350 | call_rcu(&inode->i_rcu, ntfs_i_callback); |
344 | } | 351 | } |
345 | 352 | ||
346 | static inline ntfs_inode *ntfs_alloc_extent_inode(void) | 353 | static inline ntfs_inode *ntfs_alloc_extent_inode(void) |