diff options
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/socket.c b/net/socket.c index 088fb3fd45e0..97fff3a4e72f 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -262,20 +262,20 @@ static struct inode *sock_alloc_inode(struct super_block *sb) | |||
262 | } | 262 | } |
263 | 263 | ||
264 | 264 | ||
265 | static void wq_free_rcu(struct rcu_head *head) | 265 | static void sock_free_rcu(struct rcu_head *head) |
266 | { | 266 | { |
267 | struct socket_wq *wq = container_of(head, struct socket_wq, rcu); | 267 | struct inode *inode = container_of(head, struct inode, i_rcu); |
268 | struct socket_alloc *ei = container_of(inode, struct socket_alloc, | ||
269 | vfs_inode); | ||
268 | 270 | ||
269 | kfree(wq); | 271 | kfree(ei->socket.wq); |
272 | INIT_LIST_HEAD(&inode->i_dentry); | ||
273 | kmem_cache_free(sock_inode_cachep, ei); | ||
270 | } | 274 | } |
271 | 275 | ||
272 | static void sock_destroy_inode(struct inode *inode) | 276 | static void sock_destroy_inode(struct inode *inode) |
273 | { | 277 | { |
274 | struct socket_alloc *ei; | 278 | call_rcu(&inode->i_rcu, sock_free_rcu); |
275 | |||
276 | ei = container_of(inode, struct socket_alloc, vfs_inode); | ||
277 | call_rcu(&ei->socket.wq->rcu, wq_free_rcu); | ||
278 | kmem_cache_free(sock_inode_cachep, ei); | ||
279 | } | 279 | } |
280 | 280 | ||
281 | static void init_once(void *foo) | 281 | static void init_once(void *foo) |