projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8e3572c
)
net,rcu: convert call_rcu(prl_entry_destroy_rcu) to kfree
author
Paul E. McKenney
<
[email protected]
>
Mon, 2 May 2011 07:56:57 +0000
(
00:56
-0700)
committer
Paul E. McKenney
<
[email protected]
>
Sun, 8 May 2011 05:51:15 +0000
(22:51 -0700)
The RCU callback prl_entry_destroy_rcu() just calls kfree(), so we can
use kfree_rcu() instead of call_rcu().
Signed-off-by: Paul E. McKenney <
[email protected]
>
Cc: Alexey Kuznetsov <
[email protected]
>
Cc: "Pekka Savola (ipv6)" <
[email protected]
>
Cc: James Morris <
[email protected]
>
Cc: Hideaki YOSHIFUJI <
[email protected]
>
Cc: Patrick McHardy <
[email protected]
>
Acked-by: David S. Miller <
[email protected]
>
Reviewed-by: Josh Triplett <
[email protected]
>
net/ipv6/sit.c
patch
|
blob
|
history
diff --git
a/net/ipv6/sit.c
b/net/ipv6/sit.c
index 43b33373adb2ec8e30420f0acea1367da404d820..5f35d595e4a53d36bcf9d8be8ad3c726932722ef 100644
(file)
--- a/
net/ipv6/sit.c
+++ b/
net/ipv6/sit.c
@@
-401,11
+401,6
@@
out:
return err;
}
-static void prl_entry_destroy_rcu(struct rcu_head *head)
-{
- kfree(container_of(head, struct ip_tunnel_prl_entry, rcu_head));
-}
-
static void prl_list_destroy_rcu(struct rcu_head *head)
{
struct ip_tunnel_prl_entry *p, *n;
@@
-433,7
+428,7
@@
ipip6_tunnel_del_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a)
p = &x->next) {
if (x->addr == a->addr) {
*p = x->next;
-
call_rcu(&x->rcu_head, prl_entry_destroy_rcu
);
+
kfree_rcu(x, rcu_head
);
t->prl_count--;
goto out;
}