Commit 88e7594a authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

phonet: use call_rcu for phonet device free 



Use call_rcu rather than synchronize_rcu.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb69ae04

include/net/phonet/pn_dev.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct phonet_device { 
	struct list_head list;

	struct net_device *netdev;

	DECLARE_BITMAP(addrs, 64);

	struct rcu_head	rcu;

};



int phonet_device_init(void);

net/phonet/pn_dev.c

+11 −4
Original line number Diff line number Diff line
@@ -162,6 +162,14 @@ int phonet_address_add(struct net_device *dev, u8 addr) 
	return err;

}



static void phonet_device_rcu_free(struct rcu_head *head)

{

	struct phonet_device *pnd;



	pnd = container_of(head, struct phonet_device, rcu);

	kfree(pnd);

}



int phonet_address_del(struct net_device *dev, u8 addr)

{

	struct phonet_device_list *pndevs = phonet_device_list(dev_net(dev));
@@ -179,10 +187,9 @@ int phonet_address_del(struct net_device *dev, u8 addr) 
		pnd = NULL;

	mutex_unlock(&pndevs->lock);



	if (pnd) {

		synchronize_rcu();

		kfree(pnd);

	}

	if (pnd)

		call_rcu(&pnd->rcu, phonet_device_rcu_free);



	return err;

}