diff options
author | Zefan Li <lizefan@huawei.com> | 2013-04-08 16:03:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-09 13:19:37 -0400 |
commit | 6ffd46410248ee39b46c2cdafb79791c2e618932 (patch) | |
tree | 2acaf062e43d763668ea1ccb361aa71f9ee05a20 | |
parent | 211d2f97e936d206a5e45f6f64ecbc2c51a2b46c (diff) |
netprio_cgroup: remove task_struct parameter from sock_update_netprio()
The callers always pass current to sock_update_netprio().
Signed-off-by: Li Zefan <lizefan@huawei.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/netprio_cgroup.h | 4 | ||||
-rw-r--r-- | net/core/scm.c | 2 | ||||
-rw-r--r-- | net/core/sock.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h index 1d04b6f0fbd4..50ab8c26ab59 100644 --- a/include/net/netprio_cgroup.h +++ b/include/net/netprio_cgroup.h | |||
@@ -29,7 +29,7 @@ struct cgroup_netprio_state { | |||
29 | struct cgroup_subsys_state css; | 29 | struct cgroup_subsys_state css; |
30 | }; | 30 | }; |
31 | 31 | ||
32 | extern void sock_update_netprioidx(struct sock *sk, struct task_struct *task); | 32 | extern void sock_update_netprioidx(struct sock *sk); |
33 | 33 | ||
34 | #if IS_BUILTIN(CONFIG_NETPRIO_CGROUP) | 34 | #if IS_BUILTIN(CONFIG_NETPRIO_CGROUP) |
35 | 35 | ||
@@ -68,7 +68,7 @@ static inline u32 task_netprioidx(struct task_struct *p) | |||
68 | return 0; | 68 | return 0; |
69 | } | 69 | } |
70 | 70 | ||
71 | #define sock_update_netprioidx(sk, task) | 71 | #define sock_update_netprioidx(sk) |
72 | 72 | ||
73 | #endif /* CONFIG_NETPRIO_CGROUP */ | 73 | #endif /* CONFIG_NETPRIO_CGROUP */ |
74 | 74 | ||
diff --git a/net/core/scm.c b/net/core/scm.c index c77b7c3d2f9d..03795d0147f2 100644 --- a/net/core/scm.c +++ b/net/core/scm.c | |||
@@ -290,7 +290,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) | |||
290 | /* Bump the usage count and install the file. */ | 290 | /* Bump the usage count and install the file. */ |
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); |
294 | sock_update_classid(sock->sk); | 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])); |
diff --git a/net/core/sock.c b/net/core/sock.c index 0e1d2fe827ec..d4f4cea726e7 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -1319,12 +1319,12 @@ EXPORT_SYMBOL(sock_update_classid); | |||
1319 | #endif | 1319 | #endif |
1320 | 1320 | ||
1321 | #if IS_ENABLED(CONFIG_NETPRIO_CGROUP) | 1321 | #if IS_ENABLED(CONFIG_NETPRIO_CGROUP) |
1322 | void sock_update_netprioidx(struct sock *sk, struct task_struct *task) | 1322 | void sock_update_netprioidx(struct sock *sk) |
1323 | { | 1323 | { |
1324 | if (in_interrupt()) | 1324 | if (in_interrupt()) |
1325 | return; | 1325 | return; |
1326 | 1326 | ||
1327 | sk->sk_cgrp_prioidx = task_netprioidx(task); | 1327 | sk->sk_cgrp_prioidx = task_netprioidx(current); |
1328 | } | 1328 | } |
1329 | EXPORT_SYMBOL_GPL(sock_update_netprioidx); | 1329 | EXPORT_SYMBOL_GPL(sock_update_netprioidx); |
1330 | #endif | 1330 | #endif |
@@ -1354,7 +1354,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, | |||
1354 | atomic_set(&sk->sk_wmem_alloc, 1); | 1354 | atomic_set(&sk->sk_wmem_alloc, 1); |
1355 | 1355 | ||
1356 | sock_update_classid(sk); | 1356 | sock_update_classid(sk); |
1357 | sock_update_netprioidx(sk, current); | 1357 | sock_update_netprioidx(sk); |
1358 | } | 1358 | } |
1359 | 1359 | ||
1360 | return sk; | 1360 | return sk; |