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/adfs/super.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/adfs/super.c')
-rw-r--r-- | fs/adfs/super.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 959dbff2d42d..a4041b52fbca 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c | |||
@@ -240,11 +240,18 @@ static struct inode *adfs_alloc_inode(struct super_block *sb) | |||
240 | return &ei->vfs_inode; | 240 | return &ei->vfs_inode; |
241 | } | 241 | } |
242 | 242 | ||
243 | static void adfs_destroy_inode(struct inode *inode) | 243 | static void adfs_i_callback(struct rcu_head *head) |
244 | { | 244 | { |
245 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
246 | INIT_LIST_HEAD(&inode->i_dentry); | ||
245 | kmem_cache_free(adfs_inode_cachep, ADFS_I(inode)); | 247 | kmem_cache_free(adfs_inode_cachep, ADFS_I(inode)); |
246 | } | 248 | } |
247 | 249 | ||
250 | static void adfs_destroy_inode(struct inode *inode) | ||
251 | { | ||
252 | call_rcu(&inode->i_rcu, adfs_i_callback); | ||
253 | } | ||
254 | |||
248 | static void init_once(void *foo) | 255 | static void init_once(void *foo) |
249 | { | 256 | { |
250 | struct adfs_inode_info *ei = (struct adfs_inode_info *) foo; | 257 | struct adfs_inode_info *ei = (struct adfs_inode_info *) foo; |
@@ -477,7 +484,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent) | |||
477 | adfs_error(sb, "get root inode failed\n"); | 484 | adfs_error(sb, "get root inode failed\n"); |
478 | goto error; | 485 | goto error; |
479 | } else | 486 | } else |
480 | sb->s_root->d_op = &adfs_dentry_operations; | 487 | d_set_d_op(sb->s_root, &adfs_dentry_operations); |
481 | unlock_kernel(); | 488 | unlock_kernel(); |
482 | return 0; | 489 | return 0; |
483 | 490 | ||