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

Commit b03a9c04 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

ipv6: remove ipv6_sk_ac_lock 



Just move rtnl lock up, so that the anycast list can be protected
by rtnl lock now.

Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c555490

net/ipv6/anycast.c

+3 −14
Original line number Original line Diff line number Diff line
@@ -46,10 +46,6 @@ 




static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr);

static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr);





/* Big ac list lock for all the sockets */

static DEFINE_SPINLOCK(ipv6_sk_ac_lock);





/*

/*

 *	socket join an anycast group

 *	socket join an anycast group

 */

 */
@@ -128,10 +124,8 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, const struct in6_addr *addr) 




	err = ipv6_dev_ac_inc(dev, addr);

	err = ipv6_dev_ac_inc(dev, addr);

	if (!err) {

	if (!err) {

		spin_lock_bh(&ipv6_sk_ac_lock);

		pac->acl_next = np->ipv6_ac_list;

		pac->acl_next = np->ipv6_ac_list;

		np->ipv6_ac_list = pac;

		np->ipv6_ac_list = pac;

		spin_unlock_bh(&ipv6_sk_ac_lock);

		pac = NULL;

		pac = NULL;

	}

	}
@@ -152,7 +146,7 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr) 
	struct ipv6_ac_socklist *pac, *prev_pac;

	struct ipv6_ac_socklist *pac, *prev_pac;

	struct net *net = sock_net(sk);

	struct net *net = sock_net(sk);





	spin_lock_bh(&ipv6_sk_ac_lock);

	rtnl_lock();

	prev_pac = NULL;

	prev_pac = NULL;

	for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) {

	for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) {

		if ((ifindex == 0 || pac->acl_ifindex == ifindex) &&

		if ((ifindex == 0 || pac->acl_ifindex == ifindex) &&
@@ -161,7 +155,7 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr) 
		prev_pac = pac;

		prev_pac = pac;

	}

	}

	if (!pac) {

	if (!pac) {

		spin_unlock_bh(&ipv6_sk_ac_lock);

		rtnl_unlock();

		return -ENOENT;

		return -ENOENT;

	}

	}

	if (prev_pac)

	if (prev_pac)
@@ -169,9 +163,6 @@ int ipv6_sock_ac_drop(struct sock *sk, int ifindex, const struct in6_addr *addr) 
	else

	else

		np->ipv6_ac_list = pac->acl_next;

		np->ipv6_ac_list = pac->acl_next;





	spin_unlock_bh(&ipv6_sk_ac_lock);



	rtnl_lock();

	dev = __dev_get_by_index(net, pac->acl_ifindex);

	dev = __dev_get_by_index(net, pac->acl_ifindex);

	if (dev)

	if (dev)

		ipv6_dev_ac_dec(dev, &pac->acl_addr);

		ipv6_dev_ac_dec(dev, &pac->acl_addr);
@@ -192,13 +183,11 @@ void ipv6_sock_ac_close(struct sock *sk) 
	if (!np->ipv6_ac_list)

	if (!np->ipv6_ac_list)

		return;

		return;





	spin_lock_bh(&ipv6_sk_ac_lock);

	rtnl_lock();

	pac = np->ipv6_ac_list;

	pac = np->ipv6_ac_list;

	np->ipv6_ac_list = NULL;

	np->ipv6_ac_list = NULL;

	spin_unlock_bh(&ipv6_sk_ac_lock);





	prev_index = 0;

	prev_index = 0;

	rtnl_lock();

	while (pac) {

	while (pac) {

		struct ipv6_ac_socklist *next = pac->acl_next;

		struct ipv6_ac_socklist *next = pac->acl_next;