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/jffs2/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/jffs2/super.c')
-rw-r--r-- | fs/jffs2/super.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index c86041b866a4..853b8e300084 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
@@ -40,11 +40,18 @@ static struct inode *jffs2_alloc_inode(struct super_block *sb) | |||
40 | return &f->vfs_inode; | 40 | return &f->vfs_inode; |
41 | } | 41 | } |
42 | 42 | ||
43 | static void jffs2_destroy_inode(struct inode *inode) | 43 | static void jffs2_i_callback(struct rcu_head *head) |
44 | { | 44 | { |
45 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
46 | INIT_LIST_HEAD(&inode->i_dentry); | ||
45 | kmem_cache_free(jffs2_inode_cachep, JFFS2_INODE_INFO(inode)); | 47 | kmem_cache_free(jffs2_inode_cachep, JFFS2_INODE_INFO(inode)); |
46 | } | 48 | } |
47 | 49 | ||
50 | static void jffs2_destroy_inode(struct inode *inode) | ||
51 | { | ||
52 | call_rcu(&inode->i_rcu, jffs2_i_callback); | ||
53 | } | ||
54 | |||
48 | static void jffs2_i_init_once(void *foo) | 55 | static void jffs2_i_init_once(void *foo) |
49 | { | 56 | { |
50 | struct jffs2_inode_info *f = foo; | 57 | struct jffs2_inode_info *f = foo; |