1 files changed, 9 insertions, 8 deletions

diff --git a/net/socket.c b/net/socket.c
index 97fff3a4e72f..817dc92e9ef8 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)