[PATCH v2 3/6] mm: hugetlb: change the return type for alloc_fresh_gigantic_page
From: Huang Shijie <hidden>
Date: 2016-11-14 07:09:05
Also in:
linux-mm
Subsystem:
hugetlb subsystem, memory management, the rest · Maintainers:
Muchun Song, Oscar Salvador, Andrew Morton, Linus Torvalds
This patch changes the return type to "struct page*" for alloc_fresh_gigantic_page(). This patch makes preparation for later patch. Signed-off-by: Huang Shijie <redacted> --- mm/hugetlb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index db0177b..6995087 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c@@ -1142,7 +1142,7 @@ static struct page *alloc_fresh_gigantic_page_node(struct hstate *h, return page; } -static int alloc_fresh_gigantic_page(struct hstate *h, +static struct page *alloc_fresh_gigantic_page(struct hstate *h, nodemask_t *nodes_allowed, bool no_init) { struct page *page = NULL;
@@ -1151,10 +1151,10 @@ static int alloc_fresh_gigantic_page(struct hstate *h, for_each_node_mask_to_alloc(h, nr_nodes, node, nodes_allowed) { page = alloc_fresh_gigantic_page_node(h, node, no_init); if (page) - return 1; + return page; } - return 0; + return NULL; } static inline bool gigantic_page_supported(void) { return true; }
@@ -1167,8 +1167,8 @@ static inline bool gigantic_page_supported(void) { return false; } static inline void free_gigantic_page(struct page *page, unsigned int order) { } static inline void destroy_compound_gigantic_page(struct page *page, unsigned int order) { } -static inline int alloc_fresh_gigantic_page(struct hstate *h, - nodemask_t *nodes_allowed, bool no_init) { return 0; } +static inline struct page *alloc_fresh_gigantic_page(struct hstate *h, + nodemask_t *nodes_allowed, bool no_init) { return NULL; } #endif static void update_and_free_page(struct hstate *h, struct page *page)
@@ -2315,7 +2315,7 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count, cond_resched(); if (hstate_is_gigantic(h)) - ret = alloc_fresh_gigantic_page(h, nodes_allowed, + ret = !!alloc_fresh_gigantic_page(h, nodes_allowed, false); else ret = alloc_fresh_huge_page(h, nodes_allowed);
--
2.5.5