mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Zefan Li 2013-04-08 20:03:35 +00:00 committed by David S. Miller
parent 10b96f7306
commit 211d2f97e9
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/cls_cgroup.h
View File

@ -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)
{
}

2
net/core/scm.c
View File

@ -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]));
}

6
net/core/sock.c
View File

@ -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);
}