diff options
| author | Zefan Li <lizefan@huawei.com> | 2013-04-08 20:03:35 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-09 13:19:35 -0400 |
| commit | 211d2f97e936d206a5e45f6f64ecbc2c51a2b46c (patch) | |
| tree | 229ea02f50ae5796c5a55a3ee8e9f5ed42a7c94d /net/core | |
| parent | 10b96f7306e5fbc762c2a04e005fc1d444842d9e (diff) | |
cls_cgroup: remove task_struct parameter from sock_update_classid()
The callers always pass current to sock_update_classid().
Signed-off-by: Li Zefan <lizefan@huawei.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/scm.c | 2 | ||||
| -rw-r--r-- | net/core/sock.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index 83b2b383c86..c77b7c3d2f9 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -291,7 +291,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) sock = sock_from_file(fp[i], &err); if (sock) { sock_update_netprioidx(sock->sk, current); - sock_update_classid(sock->sk, current); + sock_update_classid(sock->sk); } fd_install(new_fd, get_file(fp[i])); } diff --git a/net/core/sock.c b/net/core/sock.c index 2ff5f3619a8..0e1d2fe827e 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1307,11 +1307,11 @@ static void sk_prot_free(struct proto *prot, struct sock *sk) } #if IS_ENABLED(CONFIG_NET_CLS_CGROUP) -void sock_update_classid(struct sock *sk, struct task_struct *task) +void sock_update_classid(struct sock *sk) { u32 classid; - classid = task_cls_classid(task); + classid = task_cls_classid(current); if (classid != sk->sk_classid) sk->sk_classid = classid; } @@ -1353,7 +1353,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, sock_net_set(sk, get_net(net)); atomic_set(&sk->sk_wmem_alloc, 1); - sock_update_classid(sk, current); + sock_update_classid(sk); sock_update_netprioidx(sk, current); } |