diff options
author | Michal Hocko <mhocko@suse.com> | 2017-09-06 19:23:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 20:27:29 -0400 |
commit | c41f012ade0b95b0a6e25c7150673e0554736165 (patch) | |
tree | c3270264283dff1de402a6609b155c804c097320 /mm/vmstat.c | |
parent | 4da243ac1cf6aeb30b7c555d56208982d66d6d33 (diff) |
mm: rename global_page_state to global_zone_page_state
global_page_state is error prone as a recent bug report pointed out [1].
It only returns proper values for zone based counters as the enum it
gets suggests. We already have global_node_page_state so let's rename
global_page_state to global_zone_page_state to be more explicit here.
All existing users seems to be correct:
$ git grep "global_page_state(NR_" | sed 's@.*(\(NR_[A-Z_]*\)).*@\1@' | sort | uniq -c
2 NR_BOUNCE
2 NR_FREE_CMA_PAGES
11 NR_FREE_PAGES
1 NR_KERNEL_STACK_KB
1 NR_MLOCK
2 NR_PAGETABLE
This patch shouldn't introduce any functional change.
[1] http://lkml.kernel.org/r/201707260628.v6Q6SmaS030814@www262.sakura.ne.jp
Link: http://lkml.kernel.org/r/20170801134256.5400-2-hannes@cmpxchg.org
Signed-off-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmstat.c')
-rw-r--r-- | mm/vmstat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index e131b51654c7..ba9b202e8500 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
@@ -1502,7 +1502,7 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos) | |||
1502 | if (!v) | 1502 | if (!v) |
1503 | return ERR_PTR(-ENOMEM); | 1503 | return ERR_PTR(-ENOMEM); |
1504 | for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) | 1504 | for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) |
1505 | v[i] = global_page_state(i); | 1505 | v[i] = global_zone_page_state(i); |
1506 | v += NR_VM_ZONE_STAT_ITEMS; | 1506 | v += NR_VM_ZONE_STAT_ITEMS; |
1507 | 1507 | ||
1508 | for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) | 1508 | for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) |
@@ -1591,7 +1591,7 @@ int vmstat_refresh(struct ctl_table *table, int write, | |||
1591 | * which can equally be echo'ed to or cat'ted from (by root), | 1591 | * which can equally be echo'ed to or cat'ted from (by root), |
1592 | * can be used to update the stats just before reading them. | 1592 | * can be used to update the stats just before reading them. |
1593 | * | 1593 | * |
1594 | * Oh, and since global_page_state() etc. are so careful to hide | 1594 | * Oh, and since global_zone_page_state() etc. are so careful to hide |
1595 | * transiently negative values, report an error here if any of | 1595 | * transiently negative values, report an error here if any of |
1596 | * the stats is negative, so we know to go looking for imbalance. | 1596 | * the stats is negative, so we know to go looking for imbalance. |
1597 | */ | 1597 | */ |