memcg-add-mlock-statistic-in-memorystat-fix

tweak comments

Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Rik van Riel <riel@redhat.com>
Cc: Ying Han <yinghan@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/internal.h b/mm/internal.h
index dfe0a7da9c007557669c43636162287c17a06143..09a4a88253d27b4270f1db60965b94eeea9baa72 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -222,8 +222,8 @@ static inline void mlock_migrate_page(struct page *newpage, struct page *page)
 {
        /*
         * Here we are supposed to update the page memcg's mlock stat and the
-        * newpage memcgs' mlock. Since the page and newpage are always being
-        * charged to the same memcg, so no need.
+        * newpage memcgs' mlock. Since the two pages are always being charged
+        * to the same memcg there is no need for this.
         */
        if (TestClearPageMlocked(page)) {
                unsigned long flags;

diff --git a/mm/mlock.c b/mm/mlock.c
index cef020158aae9b0a792d03204c50d3d9b135aa21..2fd967a324f71b087e0c3996fdd7e43fc5e69ebd 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -49,9 +49,9 @@ EXPORT_SYMBOL(can_do_mlock);
  */
 
 /*
- *  LRU accounting for clear_page_mlock()
- *  Make sure the caller calls mem_cgroup_begin[end]_update_page_stat,
- *  otherwise it will be race between "move" and "page stat accounting".
+ * LRU accounting for clear_page_mlock()
+ * The caller must use mem_cgroup_begin[end]_update_page_stat to prevent a race
+ * between "move" and "page stat accounting".
  */
 void __clear_page_mlock(struct page *page)
 {