From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cong Wang Subject: [Patch net-next] ipv4: remove inet_addr_hash_lock in devinet.c Date: Mon, 5 May 2014 11:46:50 -0700 Message-ID: <1399315610-28771-1-git-send-email-xiyou.wangcong@gmail.com> Cc: "David S. Miller" , Cong Wang To: netdev@vger.kernel.org Return-path: Received: from mail-pd0-f172.google.com ([209.85.192.172]:39432 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750942AbaEESrF (ORCPT ); Mon, 5 May 2014 14:47:05 -0400 Received: by mail-pd0-f172.google.com with SMTP id g10so8327169pdj.17 for ; Mon, 05 May 2014 11:47:04 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: All the callers hold RTNL lock, so there is no need to use inet_addr_hash_lock to protect the hash list. Cc: David S. Miller Signed-off-by: Cong Wang --- diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index bdbf68b..e497700 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -106,7 +106,6 @@ static const struct nla_policy ifa_ipv4_policy[IFA_MAX+1] = { #define IN4_ADDR_HSIZE (1U << IN4_ADDR_HSIZE_SHIFT) static struct hlist_head inet_addr_lst[IN4_ADDR_HSIZE]; -static DEFINE_SPINLOCK(inet_addr_hash_lock); static u32 inet_addr_hash(struct net *net, __be32 addr) { @@ -119,16 +118,12 @@ static void inet_hash_insert(struct net *net, struct in_ifaddr *ifa) { u32 hash = inet_addr_hash(net, ifa->ifa_local); - spin_lock(&inet_addr_hash_lock); hlist_add_head_rcu(&ifa->hash, &inet_addr_lst[hash]); - spin_unlock(&inet_addr_hash_lock); } static void inet_hash_remove(struct in_ifaddr *ifa) { - spin_lock(&inet_addr_hash_lock); hlist_del_init_rcu(&ifa->hash); - spin_unlock(&inet_addr_hash_lock); } /**