2012-06-22 12:01:44

by Wanpeng Li

[permalink] [raw]
Subject: [PATCH 2/2] memcg: cleanup typos in mem cgroup

From: Wanpeng Li <[email protected]>

Signed-off-by: Wanpeng Li <[email protected]>

---
mm/memcontrol.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 776fc57..9e3c74a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -115,8 +115,8 @@ static const char * const mem_cgroup_events_names[] = {

/*
* Per memcg event counter is incremented at every pagein/pageout. With THP,
- * it will be incremated by the number of pages. This counter is used for
- * for trigger some periodic events. This is straightforward and better
+ * it will be incremented by the number of pages. This counter is used for
+ * trigger some periodic events. This is straightforward and better
* than using jiffies etc. to handle periodic memcg event.
*/
enum mem_cgroup_events_target {
@@ -678,7 +678,7 @@ mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_zone *mctz)
*
* If there are kernel internal actions which can make use of some not-exact
* value, and reading all cpu value can be performance bottleneck in some
- * common workload, threashold and synchonization as vmstat[] should be
+ * common workload, threshold and synchonization as vmstat[] should be
* implemented.
*/
static long mem_cgroup_read_stat(struct mem_cgroup *memcg,
@@ -2213,7 +2213,7 @@ static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,
if (mem_cgroup_wait_acct_move(mem_over_limit))
return CHARGE_RETRY;

- /* If we don't need to call oom-killer at el, return immediately */
+ /* If we don't need to call oom-killer at all, return immediately */
if (!oom_check)
return CHARGE_NOMEM;
/* check OOM */
@@ -2291,7 +2291,7 @@ again:
* In that case, "memcg" can point to root or p can be NULL with
* race with swapoff. Then, we have small risk of mis-accouning.
* But such kind of mis-account by race always happens because
- * we don't have cgroup_mutex(). It's overkill and we allo that
+ * we don't have cgroup_mutex(). It's overkill and we allow that
* small race, here.
* (*) swapoff at el will charge against mm-struct not against
* task-struct. So, mm->owner can be NULL.
@@ -2396,7 +2396,7 @@ static void __mem_cgroup_cancel_charge(struct mem_cgroup *memcg,
}

/*
- * Cancel chrages in this cgroup....doesn't propagate to parent cgroup.
+ * Cancel charges in this cgroup....doesn't propagate to parent cgroup.
* This is useful when moving usage to parent cgroup.
*/
static void __mem_cgroup_cancel_local_charge(struct mem_cgroup *memcg,
--
1.7.9.5


2012-06-22 12:32:50

by Michal Hocko

[permalink] [raw]
Subject: Re: [PATCH 2/2] memcg: cleanup typos in mem cgroup

On Fri 22-06-12 20:01:14, Wanpeng Li wrote:
> From: Wanpeng Li <[email protected]>
>
> Signed-off-by: Wanpeng Li <[email protected]>
>
> ---
> mm/memcontrol.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 776fc57..9e3c74a 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -115,8 +115,8 @@ static const char * const mem_cgroup_events_names[] = {
>
> /*
> * Per memcg event counter is incremented at every pagein/pageout. With THP,
> - * it will be incremated by the number of pages. This counter is used for
> - * for trigger some periodic events. This is straightforward and better
> + * it will be incremented by the number of pages. This counter is used for

.... is used to trigger ....

> + * trigger some periodic events. This is straightforward and better
> * than using jiffies etc. to handle periodic memcg event.
> */
> enum mem_cgroup_events_target {
> @@ -678,7 +678,7 @@ mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_zone *mctz)
> *
> * If there are kernel internal actions which can make use of some not-exact
> * value, and reading all cpu value can be performance bottleneck in some
> - * common workload, threashold and synchonization as vmstat[] should be
> + * common workload, threshold and synchonization as vmstat[] should be
> * implemented.
> */
> static long mem_cgroup_read_stat(struct mem_cgroup *memcg,
> @@ -2213,7 +2213,7 @@ static int mem_cgroup_do_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,
> if (mem_cgroup_wait_acct_move(mem_over_limit))
> return CHARGE_RETRY;
>
> - /* If we don't need to call oom-killer at el, return immediately */
> + /* If we don't need to call oom-killer at all, return immediately */

I think the whole comment should rather go away.

> if (!oom_check)
> return CHARGE_NOMEM;
> /* check OOM */

--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic