[PATCH 19/21] Hibernation: Prepare for handle.cur removal
in [Kernel]
|
Prev: [PATCH 05/21] Hiberation: Fix speed display.
Next: [PATCH 11/21] Hibernation: Partial page I/O support.
From: Nigel Cunningham on 2 Jun 2010 08:30 Prepare for the removal of handle.cur by stopping using it in get_swap_reader. Signed-off-by: Nigel Cunningham <nigel(a)tuxonice.net> --- kernel/power/block_io.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/power/block_io.c b/kernel/power/block_io.c index c71c7c3..dd71ef2 100644 --- a/kernel/power/block_io.c +++ b/kernel/power/block_io.c @@ -276,29 +276,29 @@ int get_swap_reader(unsigned int *flags_p, sector_t first_page) if (!handle.cur) return -ENOMEM; - error = hib_bio_read_page(first_page, handle.cur, 1); + error = hib_prepare_buffer(); if (error) { release_swap_reader(); return error; } - error = hib_prepare_buffer(); + /* Bootstrap reading the extents */ + error = hib_bio_read_page(first_page, hib_ppio_buffer, 1); if (error) { release_swap_reader(); + hib_free_buffer(); return error; } handle.k = 0; - /* Bootstrap reading the extents */ - memcpy(hib_ppio_buffer, handle.cur, PAGE_SIZE); error = hib_extents_load(§or_extents, 1); if (error) { release_swap_reader(); - return error; } + hib_free_buffer(); return error; } -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |