aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index eb1004f207b3..c200875072f7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1332,8 +1332,8 @@ static void mem_cgroup_end_move(struct mem_cgroup *memcg)
1332/* 1332/*
1333 * 2 routines for checking "mem" is under move_account() or not. 1333 * 2 routines for checking "mem" is under move_account() or not.
1334 * 1334 *
1335 * mem_cgroup_stealed() - checking a cgroup is mc.from or not. This is used 1335 * mem_cgroup_stolen() - checking whether a cgroup is mc.from or not. This
1336 * for avoiding race in accounting. If true, 1336 * is used for avoiding races in accounting. If true,
1337 * pc->mem_cgroup may be overwritten. 1337 * pc->mem_cgroup may be overwritten.
1338 * 1338 *
1339 * mem_cgroup_under_move() - checking a cgroup is mc.from or mc.to or 1339 * mem_cgroup_under_move() - checking a cgroup is mc.from or mc.to or
@@ -1341,7 +1341,7 @@ static void mem_cgroup_end_move(struct mem_cgroup *memcg)
1341 * waiting at hith-memory prressure caused by "move". 1341 * waiting at hith-memory prressure caused by "move".
1342 */ 1342 */
1343 1343
1344static bool mem_cgroup_stealed(struct mem_cgroup *memcg) 1344static bool mem_cgroup_stolen(struct mem_cgroup *memcg)
1345{ 1345{
1346 VM_BUG_ON(!rcu_read_lock_held()); 1346 VM_BUG_ON(!rcu_read_lock_held());
1347 return atomic_read(&memcg->moving_account) > 0; 1347 return atomic_read(&memcg->moving_account) > 0;
@@ -1389,7 +1389,7 @@ static bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg)
1389 * Take this lock when 1389 * Take this lock when
1390 * - a code tries to modify page's memcg while it's USED. 1390 * - a code tries to modify page's memcg while it's USED.
1391 * - a code tries to modify page state accounting in a memcg. 1391 * - a code tries to modify page state accounting in a memcg.
1392 * see mem_cgroup_stealed(), too. 1392 * see mem_cgroup_stolen(), too.
1393 */ 1393 */
1394static void move_lock_mem_cgroup(struct mem_cgroup *memcg, 1394static void move_lock_mem_cgroup(struct mem_cgroup *memcg,
1395 unsigned long *flags) 1395 unsigned long *flags)
@@ -1932,9 +1932,9 @@ again:
1932 * If this memory cgroup is not under account moving, we don't 1932 * If this memory cgroup is not under account moving, we don't
1933 * need to take move_lock_page_cgroup(). Because we already hold 1933 * need to take move_lock_page_cgroup(). Because we already hold
1934 * rcu_read_lock(), any calls to move_account will be delayed until 1934 * rcu_read_lock(), any calls to move_account will be delayed until
1935 * rcu_read_unlock() if mem_cgroup_stealed() == true. 1935 * rcu_read_unlock() if mem_cgroup_stolen() == true.
1936 */ 1936 */
1937 if (!mem_cgroup_stealed(memcg)) 1937 if (!mem_cgroup_stolen(memcg))
1938 return; 1938 return;
1939 1939
1940 move_lock_mem_cgroup(memcg, flags); 1940 move_lock_mem_cgroup(memcg, flags);