[PATCH] mm: make __put_page internal

Remove __put_page from outside the core mm/.  It is dangerous because it does
not handle compound pages nicely, and misses 1->0 transitions.  If a user
later appears that really needs the extra speed we can reevaluate.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 1850cf8bad64f9e133c3b7f498815acb9ef23e40..9b3cdfc8046d974258c3b092d8f953bf1ce79e16 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -308,7 +308,6 @@ static inline int get_page_unless_zero(struct page *page)
 }
 
 #define set_page_count(p,v)    atomic_set(&(p)->_count, (v))
-#define __put_page(p)          atomic_dec(&(p)->_count)
 
 extern void FASTCALL(__page_cache_release(struct page *));
 

diff --git a/mm/filemap.c b/mm/filemap.c
index 44da3d47699485004994c6af302c7406d606c569..e8f58f7dd7a551cf9b1138b386af673f99bdc8a4 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -30,6 +30,8 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include "filemap.h"
+#include "internal.h"
+
 /*
  * FIXME: remove all knowledge of the buffer layer from the core VM
  */

diff --git a/mm/internal.h b/mm/internal.h
index 17256bb2f4ef23bfef9ec32856057124149f414d..e3042db2a2d651c61d2d4d0e3cae2e3fdd8ca9ed 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -8,6 +8,10 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
+#ifndef __MM_INTERNAL_H
+#define __MM_INTERNAL_H
+
+#include <linux/mm.h>
 
 static inline void set_page_refs(struct page *page, int order)
 {
@@ -26,5 +30,12 @@ static inline void set_page_refs(struct page *page, int order)
 #endif /* CONFIG_MMU */
 }
 
+static inline void __put_page(struct page *page)
+{
+       atomic_dec(&page->_count);
+}
+
 extern void fastcall __init __free_pages_bootmem(struct page *page,
                                                unsigned int order);
+
+#endif

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 486184d2b50c82060baec57d89eda443c1ddeddd..3914a94aa905be83a6a533faf9c9add7d6f48cc0 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -39,6 +39,8 @@
 
 #include <linux/swapops.h>
 
+#include "internal.h"
+
 /* possible outcome of pageout() */
 typedef enum {
        /* failed to write page out, page is locked */