diff options
author | Andrew Morton <akpm@osdl.org> | 2006-10-17 03:09:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 11:18:44 -0400 |
commit | c60099bfe3a5e6fa22a930627689b3769c52153f (patch) | |
tree | 477a477f6260da7c9c7871c266205d2212e17a2c /kernel/power/swap.c | |
parent | 1fec74a9cda95772887c82ede5c0ac60f5be857e (diff) |
[PATCH] swsusp: fix memory leaks
My fancy new swsusp IO code had a big memory leak. It's somewhat invisible
because the whole mem_map[] gets overwritten after resume, but it can cause us
to get low on memory during the actual suspend process.
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power/swap.c')
-rw-r--r-- | kernel/power/swap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 9b2ee5344dee..1a3b0dd2c3fc 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
@@ -425,7 +425,8 @@ static int submit(int rw, pgoff_t page_off, struct page *page, | |||
425 | bio_set_pages_dirty(bio); | 425 | bio_set_pages_dirty(bio); |
426 | bio_put(bio); | 426 | bio_put(bio); |
427 | } else { | 427 | } else { |
428 | get_page(page); | 428 | if (rw == READ) |
429 | get_page(page); /* These pages are freed later */ | ||
429 | bio->bi_private = *bio_chain; | 430 | bio->bi_private = *bio_chain; |
430 | *bio_chain = bio; | 431 | *bio_chain = bio; |
431 | submit_bio(rw | (1 << BIO_RW_SYNC), bio); | 432 | submit_bio(rw | (1 << BIO_RW_SYNC), bio); |