On 3/12/21 4:43 PM, Mel Gorman wrote:
> Review feedback of the bulk allocator twice found problems with "alloced"
> being a counter for pages allocated. The naming was based on the API name
> "alloc" and was based on the idea that verbal communication about malloc
> tends to use the fake word "malloced" instead of the fake word mallocated.
> To be consistent, this preparation patch renames alloced to allocated
> in rmqueue_bulk so the bulk allocator and per-cpu allocator use similar
> names when the bulk allocator is introduced.
>
> Signed-off-by: Mel Gorman <mgor...@techsingularity.net>
Acked-by: Vlastimil Babka <vba...@suse.cz>
> ---
> mm/page_alloc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index f0c1d74ead6f..880b1d6368bd 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -2904,7 +2904,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int
> order,
> unsigned long count, struct list_head *list,
> int migratetype, unsigned int alloc_flags)
> {
> - int i, alloced = 0;
> + int i, allocated = 0;
>
> spin_lock(&zone->lock);
> for (i = 0; i < count; ++i) {
> @@ -2927,7 +2927,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int
> order,
> * pages are ordered properly.
> */
> list_add_tail(&page->lru, list);
> - alloced++;
> + allocated++;
> if (is_migrate_cma(get_pcppage_migratetype(page)))
> __mod_zone_page_state(zone, NR_FREE_CMA_PAGES,
> -(1 << order));
> @@ -2936,12 +2936,12 @@ static int rmqueue_bulk(struct zone *zone, unsigned
> int order,
> /*
> * i pages were removed from the buddy list even if some leak due
> * to check_pcp_refill failing so adjust NR_FREE_PAGES based
> - * on i. Do not confuse with 'alloced' which is the number of
> + * on i. Do not confuse with 'allocated' which is the number of
> * pages added to the pcp list.
> */
> __mod_zone_page_state(zone, NR_FREE_PAGES, -(i << order));
> spin_unlock(&zone->lock);
> - return alloced;
> + return allocated;
> }
>
> #ifdef CONFIG_NUMA
>
