Commit a8368cd8 authored by Andrew Morton's avatar Andrew Morton
Browse files

mm/page_alloc.c: rename check_free_page() to free_page_is_bad() 



The name "check_free_page()" provides no information regarding its return
value when the page is indeed found to be bad.

Renaming it to "free_page_is_bad()" makes it clear that a `true' return
value means the page was bad.

And make it return a bool, not an int.

[akpm@linux-foundation.org: don't use bool as int]
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: ke.wang <ke.wang@unisoc.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Zhaoyang Huang <huangzhaoyang@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4988fe69

mm/page_alloc.c

+10 −10
Original line number Diff line number Diff line
@@ -1285,20 +1285,20 @@ static const char *page_bad_reason(struct page *page, unsigned long flags) 
	return bad_reason;

}



static void check_free_page_bad(struct page *page)

static void free_page_is_bad_report(struct page *page)

{

	bad_page(page,

		 page_bad_reason(page, PAGE_FLAGS_CHECK_AT_FREE));

}



static inline int check_free_page(struct page *page)

static inline bool free_page_is_bad(struct page *page)

{

	if (likely(page_expected_state(page, PAGE_FLAGS_CHECK_AT_FREE)))

		return 0;

		return false;



	/* Something has gone sideways, find it */

	check_free_page_bad(page);

	return 1;

	free_page_is_bad_report(page);

	return true;

}



static int free_tail_pages_check(struct page *head_page, struct page *page)
@@ -1430,7 +1430,7 @@ static __always_inline bool free_pages_prepare(struct page *page, 
		for (i = 1; i < (1 << order); i++) {

			if (compound)

				bad += free_tail_pages_check(page, page + i);

			if (unlikely(check_free_page(page + i))) {

			if (unlikely(free_page_is_bad(page + i))) {

				bad++;

				continue;

			}
@@ -1441,8 +1441,8 @@ static __always_inline bool free_pages_prepare(struct page *page, 
		page->mapping = NULL;

	if (memcg_kmem_enabled() && PageMemcgKmem(page))

		__memcg_kmem_uncharge_page(page, order);

	if (check_free)

		bad += check_free_page(page);

	if (check_free && free_page_is_bad(page))

		bad++;

	if (bad)

		return false;
@@ -1504,7 +1504,7 @@ static bool free_pcp_prepare(struct page *page, unsigned int order) 
static bool bulkfree_pcp_prepare(struct page *page)

{

	if (debug_pagealloc_enabled_static())

		return check_free_page(page);

		return free_page_is_bad(page);

	else

		return false;

}
@@ -1525,7 +1525,7 @@ static bool free_pcp_prepare(struct page *page, unsigned int order) 


static bool bulkfree_pcp_prepare(struct page *page)

{

	return check_free_page(page);

	return free_page_is_bad(page);

}

#endif /* CONFIG_DEBUG_VM */