[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100120151912.GA27747@angel.research.nokia.com>
Date: Wed, 20 Jan 2010 17:19:12 +0200
From: Jarkko Lavinen <jarkko.lavinen@...ia.com>
To: Andrew Morton <akpm@...l.org>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] mm: Fix nr_good_pages calculation
Swapon wastes one page of swap space to no effect.
Mkswap stores the value 'pages - 1' into last_page field, where pages is the
partition size in pages. When nr_good_pages is calculated, last_page + 1
should be used for the number of all the pages header included.
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@...ia.com>
---
mm/swapfile.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 6c0585b..50d90ca 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1961,7 +1961,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
if (error)
goto bad_swap;
- nr_good_pages = swap_header->info.last_page -
+ nr_good_pages = swap_header->info.last_page + 1 -
swap_header->info.nr_badpages -
1 /* header page */;
--
1.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists