diff options
author | Zefan Li <lizefan@huawei.com> | 2013-04-08 16:03:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-09 13:19:35 -0400 |
commit | 211d2f97e936d206a5e45f6f64ecbc2c51a2b46c (patch) | |
tree | 229ea02f50ae5796c5a55a3ee8e9f5ed42a7c94d /net | |
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')
-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 83b2b383c865..c77b7c3d2f9d 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) | |||
291 | sock = sock_from_file(fp[i], &err); | 291 | sock = sock_from_file(fp[i], &err); |
292 | if (sock) { | 292 | if (sock) { |
293 | sock_update_netprioidx(sock->sk, current); | 293 | sock_update_netprioidx(sock->sk, current); |
294 | sock_update_classid(sock->sk, current); | 294 | sock_update_classid(sock->sk); |
295 | } | 295 | } |
296 | fd_install(new_fd, get_file(fp[i])); | 296 | fd_install(new_fd, get_file(fp[i])); |
297 | } | 297 | } |
diff --git a/net/core/sock.c b/net/core/sock.c index 2ff5f3619a8d..0e1d2fe827ec 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) | |||
1307 | } | 1307 | } |
1308 | 1308 | ||
1309 | #if IS_ENABLED(CONFIG_NET_CLS_CGROUP) | 1309 | #if IS_ENABLED(CONFIG_NET_CLS_CGROUP) |
1310 | void sock_update_classid(struct sock *sk, struct task_struct *task) | 1310 | void sock_update_classid(struct sock *sk) |
1311 | { | 1311 | { |
1312 | u32 classid; | 1312 | u32 classid; |
1313 | 1313 | ||
1314 | classid = task_cls_classid(task); | 1314 | classid = task_cls_classid(current); |
1315 | if (classid != sk->sk_classid) | 1315 | if (classid != sk->sk_classid) |
1316 | sk->sk_classid = classid; | 1316 | sk->sk_classid = classid; |
1317 | } | 1317 | } |
@@ -1353,7 +1353,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, | |||
1353 | sock_net_set(sk, get_net(net)); | 1353 | sock_net_set(sk, get_net(net)); |
1354 | atomic_set(&sk->sk_wmem_alloc, 1); | 1354 | atomic_set(&sk->sk_wmem_alloc, 1); |
1355 | 1355 | ||
1356 | sock_update_classid(sk, current); | 1356 | sock_update_classid(sk); |
1357 | sock_update_netprioidx(sk, current); | 1357 | sock_update_netprioidx(sk, current); |
1358 | } | 1358 | } |
1359 | 1359 | ||