From 3ace03cc2a03eadf83a59eecada68b37bc1a46ae Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Thu, 25 Oct 2012 04:16:57 +0000 Subject: [PATCH] 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 Cc: "David S. Miller" Cc: Eric Dumazet Cc: Glauber Costa Cc: Li Zefan Cc: Neil Horman Cc: Paul E. McKenney Cc: Tejun Heo Cc: netdev@vger.kernel.org Cc: cgroups@vger.kernel.org Acked-by: Neil Horman Signed-off-by: David S. Miller --- net/core/sock.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index c49412c..9fedbbf 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; } -- 2.7.4