[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1285566238-10966-16-git-send-email-nigel@tuxonice.net>
Date: Mon, 27 Sep 2010 15:43:50 +1000
From: Nigel Cunningham <nigel@...onice.net>
To: "Rafael J. Wysocki" <rjw@...k.pl>,
Linux PM <linux-pm@...ts.linux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>,
TuxOnIce-devel <tuxonice-devel@...onice.net>
Subject: [PATCH 15/23] Hibernation: Use block extents for reading image
Switch from using swap map pages to using block extents for
knowing where the next page needs to be read from.
Signed-off-by: Nigel Cunningham <nigel@...onice.net>
---
kernel/power/block_io.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/power/block_io.c b/kernel/power/block_io.c
index 89601d3..f2bc044 100644
--- a/kernel/power/block_io.c
+++ b/kernel/power/block_io.c
@@ -332,7 +332,7 @@ int swap_read_page(void *buf, int sync)
if (!handle.cur)
return -EINVAL;
- offset = handle.cur->entries[handle.k];
+ offset = hib_extent_next(§or_extents);
if (!offset)
return -EFAULT;
error = hib_bio_read_page(offset, buf, sync);
@@ -341,7 +341,7 @@ int swap_read_page(void *buf, int sync)
if (++handle.k >= MAP_PAGE_ENTRIES) {
error = hib_wait_on_bio_chain();
handle.k = 0;
- offset = handle.cur->next_swap;
+ offset = hib_extent_next(§or_extents);
if (!offset)
release_swap_reader();
else if (!error)
--
1.7.0.4
--
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