Subject: + memcg-correct-comments-for-__mem_cgroup_begin_update_page_stat.patch added to -mm tree To: h.huangqiang@xxxxxxxxxx,hannes@xxxxxxxxxxx,mhocko@xxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 07 May 2014 13:32:55 -0700 The patch titled Subject: memcg: correct comments for __mem_cgroup_begin_update_page_stat has been added to the -mm tree. Its filename is memcg-correct-comments-for-__mem_cgroup_begin_update_page_stat.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/memcg-correct-comments-for-__mem_cgroup_begin_update_page_stat.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/memcg-correct-comments-for-__mem_cgroup_begin_update_page_stat.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: Qiang Huang <h.huangqiang@xxxxxxxxxx> Subject: memcg: correct comments for __mem_cgroup_begin_update_page_stat Signed-off-by: Qiang Huang <h.huangqiang@xxxxxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff -puN mm/memcontrol.c~memcg-correct-comments-for-__mem_cgroup_begin_update_page_stat mm/memcontrol.c --- a/mm/memcontrol.c~memcg-correct-comments-for-__mem_cgroup_begin_update_page_stat +++ a/mm/memcontrol.c @@ -2251,12 +2251,11 @@ cleanup: } /* - * Currently used to update mapped file statistics, but the routine can be - * generalized to update other statistics as well. + * Used to update mapped file or writeback or other statistics. * * Notes: Race condition * - * We usually use page_cgroup_lock() for accessing page_cgroup member but + * We usually use lock_page_cgroup() for accessing page_cgroup member but * it tends to be costly. But considering some conditions, we doesn't need * to do so _always_. * @@ -2270,8 +2269,8 @@ cleanup: * by flags. * * Considering "move", this is an only case we see a race. To make the race - * small, we check mm->moving_account and detect there are possibility of race - * If there is, we take a lock. + * small, we check memcg->moving_account and detect there are possibility + * of race or not. If there is, we take a lock. */ void __mem_cgroup_begin_update_page_stat(struct page *page, _ Patches currently in -mm which might be from h.huangqiang@xxxxxxxxxx are memcg-fold-mem_cgroup_stolen.patch memcg-fold-mem_cgroup_stolen-fix.patch memcg-correct-comments-for-__mem_cgroup_begin_update_page_stat.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