Commit 6ffd4641 authored by Zefan Li's avatar Zefan Li Committed by David S. Miller

netprio_cgroup: remove task_struct parameter from sock_update_netprio()

The callers always pass current to sock_update_netprio().
Signed-off-by: default avatarLi Zefan <lizefan@huawei.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 211d2f97
...@@ -29,7 +29,7 @@ struct cgroup_netprio_state { ...@@ -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) ...@@ -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 */
......
...@@ -290,7 +290,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) ...@@ -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]));
......
...@@ -1319,12 +1319,12 @@ EXPORT_SYMBOL(sock_update_classid); ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment