Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932168Ab0FBMUk (ORCPT ); Wed, 2 Jun 2010 08:20:40 -0400 Received: from crca.org.au ([74.207.252.120]:55532 "EHLO crca.org.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755245Ab0FBMUh (ORCPT ); Wed, 2 Jun 2010 08:20:37 -0400 X-Bogosity: Ham, spamicity=0.000000 From: Nigel Cunningham To: "Rafael J. Wysocki" , Linux PM , LKML , TuxOnIce-devel Subject: [PATCH 15/21] Remove first_sector from swap_map_handle Date: Wed, 2 Jun 2010 22:19:14 +1000 Message-Id: <1275481160-31150-16-git-send-email-nigel@tuxonice.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1275481160-31150-1-git-send-email-nigel@tuxonice.net> References: <1275481160-31150-1-git-send-email-nigel@tuxonice.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1555 Lines: 51 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 --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/