diff --git a/[refs] b/[refs] index 712339a0556d..0179dc4dc2a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 920750ce38520da9d3e5e6f5bccb0a2b88da4d7d +refs/heads/master: 3ace03cc2a03eadf83a59eecada68b37bc1a46ae diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index c49412cdd12c..9fedbbfb0708 100644 --- a/trunk/net/core/sock.c +++ b/trunk/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; }