|
@@ -27,14 +27,6 @@ EXPORT_SYMBOL(init_net);
|
|
|
|
|
|
#define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */
|
|
#define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */
|
|
|
|
|
|
-static void net_generic_release(struct rcu_head *rcu)
|
|
|
|
-{
|
|
|
|
- struct net_generic *ng;
|
|
|
|
-
|
|
|
|
- ng = container_of(rcu, struct net_generic, rcu);
|
|
|
|
- kfree(ng);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
static int net_assign_generic(struct net *net, int id, void *data)
|
|
static int net_assign_generic(struct net *net, int id, void *data)
|
|
{
|
|
{
|
|
struct net_generic *ng, *old_ng;
|
|
struct net_generic *ng, *old_ng;
|
|
@@ -68,7 +60,7 @@ static int net_assign_generic(struct net *net, int id, void *data)
|
|
memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));
|
|
memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));
|
|
|
|
|
|
rcu_assign_pointer(net->gen, ng);
|
|
rcu_assign_pointer(net->gen, ng);
|
|
- call_rcu(&old_ng->rcu, net_generic_release);
|
|
|
|
|
|
+ kfree_rcu(old_ng, rcu);
|
|
assign:
|
|
assign:
|
|
ng->ptr[id - 1] = data;
|
|
ng->ptr[id - 1] = data;
|
|
return 0;
|
|
return 0;
|