| Message ID | 4D82DADF.4010802@cn.fujitsu.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Friday 18 March 2011 06:09:03 ext Lai Jiangshan, you wrote: > The rcu callback phonet_device_rcu_free() just calls a kfree(), > so we use kfree_rcu() instead of the call_rcu(phonet_device_rcu_free). > > Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> In principles, that's fine with me. But I think David is not taking that kind of not-a-fix patch at the moment...
From: Lai Jiangshan <laijs@cn.fujitsu.com> Date: Fri, 18 Mar 2011 12:09:03 +0800 > > > The rcu callback phonet_device_rcu_free() just calls a kfree(), > so we use kfree_rcu() instead of the call_rcu(phonet_device_rcu_free). > > Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index 947038d..1566672 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c @@ -162,14 +162,6 @@ 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)); @@ -188,7 +180,7 @@ int phonet_address_del(struct net_device *dev, u8 addr) mutex_unlock(&pndevs->lock); if (pnd) - call_rcu(&pnd->rcu, phonet_device_rcu_free); + kfree_rcu(pnd, rcu); return err; }
The rcu callback phonet_device_rcu_free() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(phonet_device_rcu_free). Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> --- net/phonet/pn_dev.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-)