Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61845220 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paul E. McKenney
Browse files

net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu() 



The rcu callback wq_free_rcu() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(wq_free_rcu).

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 7e113a9c

net/socket.c

+1 −10
Original line number Diff line number Diff line
@@ -263,15 +263,6 @@ static struct inode *sock_alloc_inode(struct super_block *sb) 
	return &ei->vfs_inode;

}







static void wq_free_rcu(struct rcu_head *head)

{

	struct socket_wq *wq = container_of(head, struct socket_wq, rcu);



	kfree(wq);

}



static void sock_destroy_inode(struct inode *inode)

{

	struct socket_alloc *ei;
@@ -279,7 +270,7 @@ static void sock_destroy_inode(struct inode *inode) 


	ei = container_of(inode, struct socket_alloc, vfs_inode);

	wq = rcu_dereference_protected(ei->socket.wq, 1);

	call_rcu(&wq->rcu, wq_free_rcu);

	kfree_rcu(wq, rcu);

	kmem_cache_free(sock_inode_cachep, ei);

}