diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 17:49:50 +1100 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 17:50:26 +1100 |
commit | ff0c7d15f9787b7e8c601533c015295cc68329f8 (patch) | |
tree | e3db53950b8ed78e542ab35a3cd3a6eaee26eccd /net/socket.c | |
parent | fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9 (diff) | |
download | kernel_samsung_tuna-ff0c7d15f9787b7e8c601533c015295cc68329f8.zip kernel_samsung_tuna-ff0c7d15f9787b7e8c601533c015295cc68329f8.tar.gz kernel_samsung_tuna-ff0c7d15f9787b7e8c601533c015295cc68329f8.tar.bz2 |
fs: avoid inode RCU freeing for pseudo fs
Pseudo filesystems that don't put inode on RCU list or reachable by
rcu-walk dentries do not need to RCU free their inodes.
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/net/socket.c b/net/socket.c index 97fff3a..817dc92 100644 --- a/net/socket.c +++ b/net/socket.c @@ -262,20 +262,21 @@ static struct inode *sock_alloc_inode(struct super_block *sb) } -static void sock_free_rcu(struct rcu_head *head) + +static void wq_free_rcu(struct rcu_head *head) { - struct inode *inode = container_of(head, struct inode, i_rcu); - struct socket_alloc *ei = container_of(inode, struct socket_alloc, - vfs_inode); + struct socket_wq *wq = container_of(head, struct socket_wq, rcu); - kfree(ei->socket.wq); - INIT_LIST_HEAD(&inode->i_dentry); - kmem_cache_free(sock_inode_cachep, ei); + kfree(wq); } static void sock_destroy_inode(struct inode *inode) { - call_rcu(&inode->i_rcu, sock_free_rcu); + struct socket_alloc *ei; + + ei = container_of(inode, struct socket_alloc, vfs_inode); + call_rcu(&ei->socket.wq->rcu, wq_free_rcu); + kmem_cache_free(sock_inode_cachep, ei); } static void init_once(void *foo) |