diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2006-09-26 02:30:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:44 -0400 |
commit | edc79b2a46ed854595e40edcf3f8b37f9f14aa3f (patch) | |
tree | c1120bebede9660ab00f9439aa7a84ab9434ac38 /mm/memory.c | |
parent | d08b3851da41d0ee60851f2c75b118e1f7a5fc89 (diff) |
[PATCH] mm: balance dirty pages
Now that we can detect writers of shared mappings, throttle them. Avoids OOM
by surprise.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index fa941b169071..dd7d7fc5ed60 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <linux/module.h> | 49 | #include <linux/module.h> |
50 | #include <linux/delayacct.h> | 50 | #include <linux/delayacct.h> |
51 | #include <linux/init.h> | 51 | #include <linux/init.h> |
52 | #include <linux/writeback.h> | ||
52 | 53 | ||
53 | #include <asm/pgalloc.h> | 54 | #include <asm/pgalloc.h> |
54 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
@@ -1571,7 +1572,7 @@ gotten: | |||
1571 | unlock: | 1572 | unlock: |
1572 | pte_unmap_unlock(page_table, ptl); | 1573 | pte_unmap_unlock(page_table, ptl); |
1573 | if (dirty_page) { | 1574 | if (dirty_page) { |
1574 | set_page_dirty(dirty_page); | 1575 | set_page_dirty_balance(dirty_page); |
1575 | put_page(dirty_page); | 1576 | put_page(dirty_page); |
1576 | } | 1577 | } |
1577 | return ret; | 1578 | return ret; |
@@ -2218,7 +2219,7 @@ retry: | |||
2218 | unlock: | 2219 | unlock: |
2219 | pte_unmap_unlock(page_table, ptl); | 2220 | pte_unmap_unlock(page_table, ptl); |
2220 | if (dirty_page) { | 2221 | if (dirty_page) { |
2221 | set_page_dirty(dirty_page); | 2222 | set_page_dirty_balance(dirty_page); |
2222 | put_page(dirty_page); | 2223 | put_page(dirty_page); |
2223 | } | 2224 | } |
2224 | return ret; | 2225 | return ret; |