summaryrefslogtreecommitdiffstats
path: root/net/core/sock.c
diff options
context:
space:
mode:
authorDaniel Wagner <daniel.wagner@bmw-carit.de>2012-10-25 04:16:57 +0000
committerDavid S. Miller <davem@davemloft.net>2012-10-26 03:40:50 -0400
commit3ace03cc2a03eadf83a59eecada68b37bc1a46ae (patch)
treee26e424e4ced4a6da80852bf43fc96763c3c3351 /net/core/sock.c
parent920750ce38520da9d3e5e6f5bccb0a2b88da4d7d (diff)
cgroup: net_cls: Remove rcu_read_lock/unlock
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>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r--net/core/sock.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index c49412cdd12..9fedbbfb070 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -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;
}