[PATCH v1 2/5] cgroup: Move sock_update_classid() decleration to cls_cgroup.h
From: Daniel Wagner <hidden>
Date: 2012-08-17 14:58:11
Also in:
netdev
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> The only user of sock_update_classid() is net/socket.c which happens to include cls_cgroup.h direclty. Signed-off-by: Daniel Wagner <redacted> Cc: Gao feng <redacted> Cc: Jamal Hadi Salim <jhs-jkUAjuhPggJWk0Htik3J/w@public.gmane.org> Cc: John Fastabend <redacted> Cc: Li Zefan <redacted> Cc: Neil Horman <redacted> Cc: Tejun Heo <redacted> Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org --- include/net/cls_cgroup.h | 8 ++++++++ include/net/sock.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h
index e2fe2b9..401672c 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); + #if IS_BUILTIN(CONFIG_NET_CLS_CGROUP) static inline u32 task_cls_classid(struct task_struct *p)
@@ -73,6 +75,12 @@ static inline u32 task_cls_classid(struct task_struct *p) #endif /* CONFIG_NET_CLS_CGROUP */ +#else /* !CONFIG_CGROUPS */ + +static inline void sock_update_classid(struct sock *sk) +{ +} + #endif /* CONFIG_CGROURPS */ #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