lkml.org 
[lkml]   [2010]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/21] Remove first_sector from swap_map_handle
    Date
    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@tuxonice.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(&sector_extents);
    + first_sector = hib_extent_current(&sector_extents);

    result = hib_extents_store(&sector_extents);
    result2 = hib_flush_write_buffer();
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2010-06-02 14:25    [W:0.040 / U:1.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site