* [PATCH 18/36] net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu()
@ 2011-03-18 4:02 Lai Jiangshan
2011-03-18 19:36 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Lai Jiangshan @ 2011-03-18 4:02 UTC (permalink / raw)
To: Paul E. McKenney, Ingo Molnar, David S. Miller, Eric Dumazet,
Tom Herbert
The rcu callback xps_dev_maps_release() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(xps_dev_maps_release).
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
net/core/net-sysfs.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 9ae2e1d..06332e5 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -876,14 +876,6 @@ static ssize_t show_xps_map(struct netdev_queue *queue,
return len;
}
-static void xps_dev_maps_release(struct rcu_head *rcu)
-{
- struct xps_dev_maps *dev_maps =
- container_of(rcu, struct xps_dev_maps, rcu);
-
- kfree(dev_maps);
-}
-
static DEFINE_MUTEX(xps_map_mutex);
#define xmap_dereference(P) \
rcu_dereference_protected((P), lockdep_is_held(&xps_map_mutex))
@@ -993,7 +985,7 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
}
if (dev_maps)
- call_rcu(&dev_maps->rcu, xps_dev_maps_release);
+ kfree_rcu(dev_maps, rcu);
netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node :
NUMA_NO_NODE);
@@ -1065,7 +1057,7 @@ static void netdev_queue_release(struct kobject *kobj)
if (!nonempty) {
RCU_INIT_POINTER(dev->xps_maps, NULL);
- call_rcu(&dev_maps->rcu, xps_dev_maps_release);
+ kfree_rcu(dev_maps, rcu);
}
}
--
1.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 18/36] net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu()
2011-03-18 4:02 [PATCH 18/36] net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu() Lai Jiangshan
@ 2011-03-18 19:36 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-03-18 19:36 UTC (permalink / raw)
To: laijs
Cc: paulmck, mingo, eric.dumazet, therbert, ebiederm, gregkh, netdev,
linux-kernel
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 12:02:47 +0800
>
>
> The rcu callback xps_dev_maps_release() just calls a kfree(),
> so we use kfree_rcu() instead of the call_rcu(xps_dev_maps_release).
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-18 19:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-18 4:02 [PATCH 18/36] net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu() Lai Jiangshan
2011-03-18 19:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).