Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netprio_cgroup: remove task_struct parameter from sock_update_netprio()

Browse source 
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>
This commit is contained in:
Zefan Li 2013-04-08 20:03:47 +00:00 • committed by David S. Miller
parent 211d2f97e9
commit 6ffd464102
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/net/netprio_cgroup.h
View file

@ -29,7 +29,7 @@ struct cgroup_netprio_state {
struct cgroup_subsys_state css; struct cgroup_subsys_state css;
}; };
extern void sock_update_netprioidx(struct sock *sk, struct task_struct *task); extern void sock_update_netprioidx(struct sock *sk);
#if IS_BUILTIN(CONFIG_NETPRIO_CGROUP) #if IS_BUILTIN(CONFIG_NETPRIO_CGROUP)
@ -68,7 +68,7 @@ static inline u32 task_netprioidx(struct task_struct *p)
return 0; return 0;
} }
#define sock_update_netprioidx(sk, task) #define sock_update_netprioidx(sk)
#endif /* CONFIG_NETPRIO_CGROUP */ #endif /* CONFIG_NETPRIO_CGROUP */

2
net/core/scm.c
View file

@ -290,7 +290,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
/* Bump the usage count and install the file. */ /* Bump the usage count and install the file. */
sock = sock_from_file(fp[i], &err); sock = sock_from_file(fp[i], &err);
if (sock) { if (sock) {
sock_update_netprioidx(sock->sk, current); sock_update_netprioidx(sock->sk);
sock_update_classid(sock->sk); sock_update_classid(sock->sk);
} }
fd_install(new_fd, get_file(fp[i])); fd_install(new_fd, get_file(fp[i]));

6
net/core/sock.c
View file

@ -1319,12 +1319,12 @@ EXPORT_SYMBOL(sock_update_classid);
#endif #endif
#if IS_ENABLED(CONFIG_NETPRIO_CGROUP) #if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
void sock_update_netprioidx(struct sock *sk, struct task_struct *task) void sock_update_netprioidx(struct sock *sk)
{ {
if (in_interrupt()) if (in_interrupt())
return; return;
sk->sk_cgrp_prioidx = task_netprioidx(task); sk->sk_cgrp_prioidx = task_netprioidx(current);
} }
EXPORT_SYMBOL_GPL(sock_update_netprioidx); EXPORT_SYMBOL_GPL(sock_update_netprioidx);
#endif #endif
@ -1354,7 +1354,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
atomic_set(&sk->sk_wmem_alloc, 1); atomic_set(&sk->sk_wmem_alloc, 1);
sock_update_classid(sk); sock_update_classid(sk);
sock_update_netprioidx(sk, current); sock_update_netprioidx(sk);
} }
return sk; return sk;