The patch titled
Subject: memcg: move memcg_proto_active from sock.h
has been added to the -mm tree. Its filename is
memcg-move-memcg_proto_active-from-sockh.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/memcg-move-memcg_proto_active-from-sockh.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/memcg-move-memcg_proto_active-from-sockh.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Michal Hocko <mhocko@xxxxxxxx>
Subject: 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@xxxxxxxx>
Cc: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/net/sock.h | 5 -----
mm/memcontrol.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff -puN include/net/sock.h~memcg-move-memcg_proto_active-from-sockh include/net/sock.h
--- a/include/net/sock.h~memcg-move-memcg_proto_active-from-sockh
+++ a/include/net/sock.h
@@ -1043,11 +1043,6 @@ struct proto {
int proto_register(struct proto *prot, int alloc_slab);
void proto_unregister(struct proto *prot);
-static inline bool memcg_proto_active(struct cg_proto *cg_proto)
-{
- return test_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags);
-}
-
#ifdef SOCK_REFCNT_DEBUG
static inline void sk_refcnt_debug_inc(struct sock *sk)
{
diff -puN mm/memcontrol.c~memcg-move-memcg_proto_active-from-sockh mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-move-memcg_proto_active-from-sockh
+++ a/mm/memcontrol.c
@@ -315,7 +315,7 @@ void sock_update_memcg(struct sock *sk)
rcu_read_lock();
memcg = mem_cgroup_from_task(current);
cg_proto = sk->sk_prot->proto_cgroup(memcg);
- if (cg_proto && memcg_proto_active(cg_proto) &&
+ if (cg_proto && test_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags) &&
css_tryget_online(&memcg->css)) {
sk->sk_cgrp = cg_proto;
}
_
Patches currently in -mm which might be from mhocko@xxxxxxxx are
mm-send-one-ipi-per-cpu-to-tlb-flush-all-entries-after-unmapping-pages-fix.patch
mm-oom-remove-unnecessary-variable.patch
memcg-move-memcg_proto_active-from-sockh.patch
mm-srcu-ify-shrinkers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
