diff options
author | Oleg Nesterov <oleg@redhat.com> | 2014-01-21 18:49:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 19:19:43 -0500 |
commit | 5eaf1a9e233d61438377f57facb167f8208ba9fd (patch) | |
tree | c1455aa3d758ea5ebb5879f655b4e7ddf4079d94 /include | |
parent | c728852f5dd41ce34e7ce0a179cf28cd5f4dc301 (diff) |
mm: thp: turn compound_head() into BUG_ON(!PageTail) in get_huge_page_tail()
get_huge_page_tail()->compound_head() looks confusing. Every caller
must check PageTail(page), otherwise atomic_inc(&page->_mapcount) is
simply wrong if this page is compound-trans-head.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Dave Jones <davej@redhat.com>
Cc: Darren Hart <dvhart@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mel Gorman <mgorman@suse.de>
Acked-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mm.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index f95c71b7c1fd..58202c26c559 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -445,13 +445,12 @@ static inline bool compound_tail_refcounted(struct page *page) | |||
445 | static inline void get_huge_page_tail(struct page *page) | 445 | static inline void get_huge_page_tail(struct page *page) |
446 | { | 446 | { |
447 | /* | 447 | /* |
448 | * __split_huge_page_refcount() cannot run | 448 | * __split_huge_page_refcount() cannot run from under us. |
449 | * from under us. | ||
450 | * In turn no need of compound_trans_head here. | ||
451 | */ | 449 | */ |
450 | VM_BUG_ON(!PageTail(page)); | ||
452 | VM_BUG_ON(page_mapcount(page) < 0); | 451 | VM_BUG_ON(page_mapcount(page) < 0); |
453 | VM_BUG_ON(atomic_read(&page->_count) != 0); | 452 | VM_BUG_ON(atomic_read(&page->_count) != 0); |
454 | if (compound_tail_refcounted(compound_head(page))) | 453 | if (compound_tail_refcounted(page->first_page)) |
455 | atomic_inc(&page->_mapcount); | 454 | atomic_inc(&page->_mapcount); |
456 | } | 455 | } |
457 | 456 | ||