aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2006-03-22 00:08:33 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 07:54:01 -0800
commit0f8053a509ceba4a077a50ea7b77039b5559b428 (patch)
tree5a66021540395e20256f38a3a45174617428a832
parent4fa4f53bf92139595cae6f1a3d972fc0a3451d29 (diff)
[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>
-rw-r--r--include/linux/mm.h1
-rw-r--r--mm/filemap.c2
-rw-r--r--mm/internal.h11
-rw-r--r--mm/vmscan.c2
4 files changed, 15 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 1850cf8bad6..9b3cdfc8046 100644
--- 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 44da3d47699..e8f58f7dd7a 100644
--- 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 17256bb2f4e..e3042db2a2d 100644
--- 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 486184d2b50..3914a94aa90 100644
--- 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 */