On Thu, Oct 25, 2012 at 04:16:57PM +0200, Daniel Wagner wrote: > From: Daniel Wagner <daniel.wagner@xxxxxxxxxxxx> > > 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@xxxxxxxxxxxx> > Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> > Cc: Eric Dumazet <edumazet@xxxxxxxxxx> > Cc: Glauber Costa <glommer@xxxxxxxxxxxxx> > Cc: Li Zefan <lizefan@xxxxxxxxxx> > Cc: Neil Horman <nhorman@xxxxxxxxxxxxx> > Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx> > Cc: Tejun Heo <tj@xxxxxxxxxx> > Cc: netdev@xxxxxxxxxxxxxxx > Cc: cgroups@xxxxxxxxxxxxxxx > --- > 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; > } > -- > 1.8.0.rc0 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html