aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2015-09-08 18:01:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-08 18:35:28 -0400
commite752eb68811aeece2220e183e23369a34122fb5e (patch)
tree1cbd1c71e9b71e116dd4ef966cbbb39315b602dd /include/net
parenta03f1f058969ec350fb7451a6fbca23096ee5727 (diff)
memcg: move memcg_proto_active from sock.h
The only user is sock_update_memcg which is living in memcontrol.c so it doesn't make much sense to pollute sock.h by this inline helper. Move it to memcontrol.c and open code it into its only caller. Signed-off-by: Michal Hocko <mhocko@suse.com> Cc: Vladimir Davydov <vdavydov@parallels.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index a98c71ea40c5..7aa78440559a 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1045,11 +1045,6 @@ struct proto {
1045int proto_register(struct proto *prot, int alloc_slab); 1045int proto_register(struct proto *prot, int alloc_slab);
1046void proto_unregister(struct proto *prot); 1046void proto_unregister(struct proto *prot);
1047 1047
1048static inline bool memcg_proto_active(struct cg_proto *cg_proto)
1049{
1050 return test_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags);
1051}
1052
1053#ifdef SOCK_REFCNT_DEBUG 1048#ifdef SOCK_REFCNT_DEBUG
1054static inline void sk_refcnt_debug_inc(struct sock *sk) 1049static inline void sk_refcnt_debug_inc(struct sock *sk)
1055{ 1050{