[PATCH] mm: make compound page destructor handling explicit

Currently we we use the lru head link of the second page of a compound page
to hold its destructor.  This was ok when it was purely an internal
implmentation detail.  However, hugetlbfs overrides this destructor
violating the layering.  Abstract this out as explicit calls, also
introduce a type for the callback function allowing them to be type
checked.  For each callback we pre-declare the function, causing a type
error on definition rather than on use elsewhere.

[akpm@osdl.org: cleanups]
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/swap.c b/mm/swap.c
index d9a3770d8f3c..017e72ca9bbb 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -57,9 +57,9 @@ static void put_compound_page(struct page *page)
 {
         page = (struct page *)page_private(page);
         if (put_page_testzero(page)) {
-                void (*dtor)(struct page *page);
+                compound_page_dtor *dtor;
 
-                dtor = (void (*)(struct page *))page[1].lru.next;
+                dtor = get_compound_page_dtor(page);
                 (*dtor)(page);
         }
 }