cgroup: net_cls: Remove rcu_read_lock/unlock
authorDaniel Wagner <daniel.wagner@bmw-carit.de>
Thu, 25 Oct 2012 04:16:57 +0000 (04:16 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Oct 2012 07:40:50 +0000 (03:40 -0400)
As Eric pointed out:
"Hey task_cls_classid() has its own rcu protection since commit
3fb5a991916091a908d (cls_cgroup: Fix rcu lockdep warning)

So we can safely revert Paul commit (1144182a8757f2a1)
(We no longer need rcu_read_lock/unlock here)"

Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: netdev@vger.kernel.org
Cc: cgroups@vger.kernel.org
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/sock.c

index c49412cdd12c867ffda0afefe1d2146d25e002bc..9fedbbfb0708022cd7547866e06ffbdac9701456 100644 (file)
@@ -1221,9 +1221,7 @@ void sock_update_classid(struct sock *sk)
 {
        u32 classid;
 
-       rcu_read_lock();  /* doing current task, which cannot vanish. */
        classid = task_cls_classid(current);
-       rcu_read_unlock();
        if (classid != sk->sk_classid)
                sk->sk_classid = classid;
 }