mm: memcontrol: clean up memory.events counting function

We only ever count single events, drop the @nr parameter.  Rename the
function accordingly.  Remove low-information kerneldoc.

Link: http://lkml.kernel.org/r/20170404220148.28338-1-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index cfa91a3ca0ca76b0fcddf2b05d25bd861235d2c6..bc0c16e284c0aa2409e2ab13f86c37e9c5ae8f02 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -287,17 +287,10 @@ static inline bool mem_cgroup_disabled(void)
        return !cgroup_subsys_enabled(memory_cgrp_subsys);
 }
 
-/**
- * mem_cgroup_events - count memory events against a cgroup
- * @memcg: the memory cgroup
- * @idx: the event index
- * @nr: the number of events to account for
- */
-static inline void mem_cgroup_events(struct mem_cgroup *memcg,
-                      enum mem_cgroup_events_index idx,
-                      unsigned int nr)
+static inline void mem_cgroup_event(struct mem_cgroup *memcg,
+                                   enum mem_cgroup_events_index idx)
 {
-       this_cpu_add(memcg->stat->events[idx], nr);
+       this_cpu_inc(memcg->stat->events[idx]);
        cgroup_file_notify(&memcg->events_file);
 }
 
@@ -614,9 +607,8 @@ static inline bool mem_cgroup_disabled(void)
        return true;
 }
 
-static inline void mem_cgroup_events(struct mem_cgroup *memcg,
-                                    enum mem_cgroup_events_index idx,
-                                    unsigned int nr)
+static inline void mem_cgroup_event(struct mem_cgroup *memcg,
+                                   enum mem_cgroup_events_index idx)
 {
 }
 

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 108d5b097db15587253fcb6e992d7ced1c342dda..1ffa3ad201ea1ead144c2acead2fd78cd208cedb 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1825,7 +1825,7 @@ static void reclaim_high(struct mem_cgroup *memcg,
        do {
                if (page_counter_read(&memcg->memory) <= memcg->high)
                        continue;
-               mem_cgroup_events(memcg, MEMCG_HIGH, 1);
+               mem_cgroup_event(memcg, MEMCG_HIGH);
                try_to_free_mem_cgroup_pages(memcg, nr_pages, gfp_mask, true);
        } while ((memcg = parent_mem_cgroup(memcg)));
 }
@@ -1916,7 +1916,7 @@ retry:
        if (!gfpflags_allow_blocking(gfp_mask))
                goto nomem;
 
-       mem_cgroup_events(mem_over_limit, MEMCG_MAX, 1);
+       mem_cgroup_event(mem_over_limit, MEMCG_MAX);
 
        nr_reclaimed = try_to_free_mem_cgroup_pages(mem_over_limit, nr_pages,
                                                    gfp_mask, may_swap);
@@ -1959,7 +1959,7 @@ retry:
        if (fatal_signal_pending(current))
                goto force;
 
-       mem_cgroup_events(mem_over_limit, MEMCG_OOM, 1);
+       mem_cgroup_event(mem_over_limit, MEMCG_OOM);
 
        mem_cgroup_oom(mem_over_limit, gfp_mask,
                       get_order(nr_pages * PAGE_SIZE));
@@ -5142,7 +5142,7 @@ static ssize_t memory_max_write(struct kernfs_open_file *of,
                        continue;
                }
 
-               mem_cgroup_events(memcg, MEMCG_OOM, 1);
+               mem_cgroup_event(memcg, MEMCG_OOM);
                if (!mem_cgroup_out_of_memory(memcg, GFP_KERNEL, 0))
                        break;
        }

diff --git a/mm/vmscan.c b/mm/vmscan.c
index e8cb983a8c84c901bf1718ed525c8cbbfa857657..fbec74af2b69e7f9c35f6e989703f9c3da655757 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2526,7 +2526,7 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
                                        sc->memcg_low_skipped = 1;
                                        continue;
                                }
-                               mem_cgroup_events(memcg, MEMCG_LOW, 1);
+                               mem_cgroup_event(memcg, MEMCG_LOW);
                        }
 
                        reclaimed = sc->nr_reclaimed;