lkml.org 
[lkml]   [2012]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC tip/core/rcu 10/41] ipv4: Convert call_rcu() to kfree_rcu()
    Date
    From: "Paul E. McKenney" <paul.mckenney@linaro.org>

    The call_rcu() in do_ip_setsockopt() invokes opt_kfree_rcu(), which just
    calls kfree(). So convert the call_rcu() to kfree_rcu(), which allows
    opt_kfree_rcu() to be eliminated.

    Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
    Cc: James Morris <jmorris@namei.org>
    Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
    Cc: Patrick McHardy <kaber@trash.net>
    Cc: netdev@vger.kernel.org
    ---
    net/ipv4/ip_sockglue.c | 7 +------
    1 files changed, 1 insertions(+), 6 deletions(-)

    diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
    index 8aa87c1..5343d9a 100644
    --- a/net/ipv4/ip_sockglue.c
    +++ b/net/ipv4/ip_sockglue.c
    @@ -445,11 +445,6 @@ out:
    }


    -static void opt_kfree_rcu(struct rcu_head *head)
    -{
    - kfree(container_of(head, struct ip_options_rcu, rcu));
    -}
    -
    /*
    * Socket option code for IP. This is the end of the line after any
    * TCP,UDP etc options on an IP socket.
    @@ -525,7 +520,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
    }
    rcu_assign_pointer(inet->inet_opt, opt);
    if (old)
    - call_rcu(&old->rcu, opt_kfree_rcu);
    + kfree_rcu(old, rcu);
    break;
    }
    case IP_PKTINFO:
    --
    1.7.8


    \
     
     \ /
      Last update: 2012-02-01 20:57    [W:0.024 / U:0.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site