lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 12 Sep 2012 16:12:01 +0200 From: Daniel Wagner <wagi@...om.org> To: netdev@...r.kernel.org, cgroups@...r.kernel.org Cc: Daniel Wagner <daniel.wagner@...-carit.de>, Gao feng <gaofeng@...fujitsu.com>, Jamal Hadi Salim <jhs@...atatu.com>, John Fastabend <john.r.fastabend@...el.com>, Li Zefan <lizefan@...wei.com>, Neil Horman <nhorman@...driver.com> Subject: [PATCH v4 1/8] cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h From: Daniel Wagner <daniel.wagner@...-carit.de> The only user of sock_update_classid() is net/socket.c which happens to include cls_cgroup.h directly. Signed-off-by: Daniel Wagner <daniel.wagner@...-carit.de> Acked-by: Tejun Heo <tj@...nel.org> Cc: Gao feng <gaofeng@...fujitsu.com> Cc: Jamal Hadi Salim <jhs@...atatu.com> Cc: John Fastabend <john.r.fastabend@...el.com> Cc: Li Zefan <lizefan@...wei.com> Cc: Neil Horman <nhorman@...driver.com> Cc: netdev@...r.kernel.org Cc: cgroups@...r.kernel.org --- include/net/cls_cgroup.h | 6 ++++++ include/net/sock.h | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h index a4dc5b0..e88527a 100644 --- a/include/net/cls_cgroup.h +++ b/include/net/cls_cgroup.h @@ -24,6 +24,8 @@ struct cgroup_cls_state u32 classid; }; +extern void sock_update_classid(struct sock *sk); + #ifdef CONFIG_NET_CLS_CGROUP static inline u32 task_cls_classid(struct task_struct *p) { @@ -62,6 +64,10 @@ static inline u32 task_cls_classid(struct task_struct *p) } #endif #else +static inline void sock_update_classid(struct sock *sk) +{ +} + static inline u32 task_cls_classid(struct task_struct *p) { return 0; diff --git a/include/net/sock.h b/include/net/sock.h index 72132ae..160a680 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1486,14 +1486,6 @@ extern void *sock_kmalloc(struct sock *sk, int size, extern void sock_kfree_s(struct sock *sk, void *mem, int size); extern void sk_send_sigurg(struct sock *sk); -#ifdef CONFIG_CGROUPS -extern void sock_update_classid(struct sock *sk); -#else -static inline void sock_update_classid(struct sock *sk) -{ -} -#endif - /* * Functions to fill in entries in struct proto_ops when a protocol * does not implement a particular function. -- 1.7.12.315.g682ce8b -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists