Commit fe925c0c authored by chenqiwu's avatar chenqiwu Committed by Linus Torvalds

mm/page_alloc: simplify page_is_buddy() for better code readability

Simplify page_is_buddy() to reduce the redundant code for better code
readability.
Signed-off-by: default avatarchenqiwu <chenqiwu@xiaomi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarAlexander Duyck <alexander.h.duyck@linux.intel.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarPankaj Gupta <pankaj.gupta.linux@gmail.com>
Link: http://lkml.kernel.org/r/1583853751-5525-1-git-send-email-qiwuchen55@gmail.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97ce86f9
...@@ -792,32 +792,25 @@ static inline void set_page_order(struct page *page, unsigned int order) ...@@ -792,32 +792,25 @@ static inline void set_page_order(struct page *page, unsigned int order)
* *
* For recording page's order, we use page_private(page). * For recording page's order, we use page_private(page).
*/ */
static inline int page_is_buddy(struct page *page, struct page *buddy, static inline bool page_is_buddy(struct page *page, struct page *buddy,
unsigned int order) unsigned int order)
{ {
if (page_is_guard(buddy) && page_order(buddy) == order) { if (!page_is_guard(buddy) && !PageBuddy(buddy))
if (page_zone_id(page) != page_zone_id(buddy)) return false;
return 0;
VM_BUG_ON_PAGE(page_count(buddy) != 0, buddy);
return 1; if (page_order(buddy) != order)
} return false;
if (PageBuddy(buddy) && page_order(buddy) == order) {
/* /*
* zone check is done late to avoid uselessly * zone check is done late to avoid uselessly calculating
* calculating zone/node ids for pages that could * zone/node ids for pages that could never merge.
* never merge.
*/ */
if (page_zone_id(page) != page_zone_id(buddy)) if (page_zone_id(page) != page_zone_id(buddy))
return 0; return false;
VM_BUG_ON_PAGE(page_count(buddy) != 0, buddy); VM_BUG_ON_PAGE(page_count(buddy) != 0, buddy);
return 1; return true;
}
return 0;
} }
#ifdef CONFIG_COMPACTION #ifdef CONFIG_COMPACTION
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment