[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1275481160-31150-16-git-send-email-nigel@tuxonice.net>
Date: Wed, 2 Jun 2010 22:19:14 +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/21] Remove first_sector from swap_map_handle
Remove the 'first_sector' variable from the swap_map_handle
struct. It will continue to be used whereas the other members
of the struct will be deleted in a following patch.
Signed-off-by: Nigel Cunningham <nigel@...onice.net>
---
kernel/power/block_io.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/power/block_io.c b/kernel/power/block_io.c
index 6745e77..9028f74 100644
--- a/kernel/power/block_io.c
+++ b/kernel/power/block_io.c
@@ -140,10 +140,10 @@ struct swap_map_page {
struct swap_map_handle {
struct swap_map_page *cur;
sector_t cur_swap;
- sector_t first_sector;
unsigned int k;
};
+static sector_t first_sector;
static struct swap_map_handle handle;
extern struct hib_extent_state sector_extents;
@@ -159,7 +159,7 @@ unsigned int hib_bio_overhead(unsigned int nr_pages)
/* Get the first sector of the image proper, for storing in the signature */
sector_t hib_get_first_sector(void)
{
- return handle.first_sector;
+ return first_sector;
}
/**
@@ -213,7 +213,7 @@ int hib_bio_prepare_write(void)
return result;
}
- handle.first_sector = hib_extent_current(§or_extents);
+ first_sector = hib_extent_current(§or_extents);
result = hib_extents_store(§or_extents);
result2 = hib_flush_write_buffer();
--
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