[PATCH v3 1/6] cgroup: Move cls function definition to cls_cgroup.h
flat view
STALE5168d
From: Daniel Wagner <hidden>
Date: 2012-08-14 13:02:26
Also in:
cgroups
Subsystem:
networking [general], networking [sockets], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Willem de Bruijn, Linus Torvalds
From: Daniel Wagner <redacted> sock_update_classid() is used by net/socket.c which includes cls_cgroup.h directly. Signed-off-by: Daniel Wagner <redacted> Cc: "David S. Miller" <davem@davemloft.net> Cc: Li Zefan <redacted> Cc: Tejun Heo <tj@kernel.org> Cc: cgroups@vger.kernel.org Cc: netdev@vger.kernel.org --- include/net/cls_cgroup.h | 7 +++++++ include/net/sock.h | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h
index a4dc5b0..5f49b69 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,9 +64,14 @@ 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; } #endif + #endif /* _NET_CLS_CGROUP_H */
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.rc1.16.g05a20c8