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>
This commit is contained in:
Родитель
10b96f7306
Коммит
211d2f97e9
|
@ -24,7 +24,7 @@ struct cgroup_cls_state
|
|||
u32 classid;
|
||||
};
|
||||
|
||||
extern void sock_update_classid(struct sock *sk, struct task_struct *task);
|
||||
extern void sock_update_classid(struct sock *sk);
|
||||
|
||||
#if IS_BUILTIN(CONFIG_NET_CLS_CGROUP)
|
||||
static inline u32 task_cls_classid(struct task_struct *p)
|
||||
|
@ -61,7 +61,7 @@ static inline u32 task_cls_classid(struct task_struct *p)
|
|||
}
|
||||
#endif
|
||||
#else /* !CGROUP_NET_CLS_CGROUP */
|
||||
static inline void sock_update_classid(struct sock *sk, struct task_struct *task)
|
||||
static inline void sock_update_classid(struct sock *sk)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -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]));
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче