Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13fd1dd9 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

mm/memcontrol.c: s/stealed/stolen/ 



A grammatical fix.

Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4331f7d3

mm/memcontrol.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1332,8 +1332,8 @@ static void mem_cgroup_end_move(struct mem_cgroup *memcg) 
/*

/*

 * 2 routines for checking "mem" is under move_account() or not.

 * 2 routines for checking "mem" is under move_account() or not.

 *

 *

 * mem_cgroup_stealed() - checking a cgroup is mc.from or not. This is used

 * mem_cgroup_stolen() -  checking whether a cgroup is mc.from or not. This

 *			  for avoiding race in accounting. If true,

 *			  is used for avoiding races in accounting.  If true,

 *			  pc->mem_cgroup may be overwritten.

 *			  pc->mem_cgroup may be overwritten.

 *

 *

 * mem_cgroup_under_move() - checking a cgroup is mc.from or mc.to or

 * 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) 
 *			  waiting at hith-memory prressure caused by "move".

 *			  waiting at hith-memory prressure caused by "move".

 */

 */





static bool mem_cgroup_stealed(struct mem_cgroup *memcg)

static bool mem_cgroup_stolen(struct mem_cgroup *memcg)

{

{

	VM_BUG_ON(!rcu_read_lock_held());

	VM_BUG_ON(!rcu_read_lock_held());

	return atomic_read(&memcg->moving_account) > 0;

	return atomic_read(&memcg->moving_account) > 0;
@@ -1389,7 +1389,7 @@ static bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg) 
 * Take this lock when

 * Take this lock when

 * - a code tries to modify page's memcg while it's USED.

 * - a code tries to modify page's memcg while it's USED.

 * - a code tries to modify page state accounting in a memcg.

 * - a code tries to modify page state accounting in a memcg.

 * see mem_cgroup_stealed(), too.

 * see mem_cgroup_stolen(), too.

 */

 */

static void move_lock_mem_cgroup(struct mem_cgroup *memcg,

static void move_lock_mem_cgroup(struct mem_cgroup *memcg,

				  unsigned long *flags)

				  unsigned long *flags)
@@ -1932,9 +1932,9 @@ again: 
	 * If this memory cgroup is not under account moving, we don't

	 * If this memory cgroup is not under account moving, we don't

	 * need to take move_lock_page_cgroup(). Because we already hold

	 * need to take move_lock_page_cgroup(). Because we already hold

	 * rcu_read_lock(), any calls to move_account will be delayed until

	 * rcu_read_lock(), any calls to move_account will be delayed until

	 * rcu_read_unlock() if mem_cgroup_stealed() == true.

	 * rcu_read_unlock() if mem_cgroup_stolen() == true.

	 */

	 */

	if (!mem_cgroup_stealed(memcg))

	if (!mem_cgroup_stolen(memcg))

		return;

		return;





	move_lock_mem_cgroup(memcg, flags);

	move_lock_mem_cgroup(memcg, flags);