lkml.org 
[lkml]   [2012]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] staging: zram: Remove useless struct zobj_header
    Date
    The struct zobj_header has no members, so the sizeof(struct zobj_header *)
    always returns zero. For this reason we are removing this useless struct.

    Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
    ---
    drivers/staging/zram/zram_drv.c | 9 +++------
    drivers/staging/zram/zram_drv.h | 9 ---------
    2 files changed, 3 insertions(+), 15 deletions(-)

    diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
    index 5216ee1..a79a20d 100644
    --- a/drivers/staging/zram/zram_drv.c
    +++ b/drivers/staging/zram/zram_drv.c
    @@ -209,7 +209,6 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
    int ret;
    size_t clen;
    struct page *page;
    - struct zobj_header *zheader;
    unsigned char *user_mem, *cmem, *uncmem = NULL;

    page = bvec->bv_page;
    @@ -249,7 +248,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,

    cmem = zs_map_object(zram->mem_pool, zram->table[index].handle);

    - ret = lzo1x_decompress_safe(cmem + sizeof(*zheader),
    + ret = lzo1x_decompress_safe(cmem,
    zram->table[index].size,
    uncmem, &clen);

    @@ -278,7 +277,6 @@ static int zram_read_before_write(struct zram *zram, char *mem, u32 index)
    {
    int ret;
    size_t clen = PAGE_SIZE;
    - struct zobj_header *zheader;
    unsigned char *cmem;

    if (zram_test_flag(zram, index, ZRAM_ZERO) ||
    @@ -296,7 +294,7 @@ static int zram_read_before_write(struct zram *zram, char *mem, u32 index)
    return 0;
    }

    - ret = lzo1x_decompress_safe(cmem + sizeof(*zheader),
    + ret = lzo1x_decompress_safe(cmem,
    zram->table[index].size,
    mem, &clen);
    zs_unmap_object(zram->mem_pool, zram->table[index].handle);
    @@ -318,7 +316,6 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
    u32 store_offset;
    size_t clen;
    void *handle;
    - struct zobj_header *zheader;
    struct page *page, *page_store;
    unsigned char *user_mem, *cmem, *src, *uncmem = NULL;

    @@ -405,7 +402,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
    goto memstore;
    }

    - handle = zs_malloc(zram->mem_pool, clen + sizeof(*zheader));
    + handle = zs_malloc(zram->mem_pool, clen);
    if (!handle) {
    pr_info("Error allocating memory for compressed "
    "page: %u, size=%zu\n", index, clen);
    diff --git a/drivers/staging/zram/zram_drv.h b/drivers/staging/zram/zram_drv.h
    index fe3f8fe..883f313 100644
    --- a/drivers/staging/zram/zram_drv.h
    +++ b/drivers/staging/zram/zram_drv.h
    @@ -26,15 +26,6 @@
    */
    static const unsigned max_num_devices = 32;

    -/*
    - * Stored at beginning of each compressed object.
    - *
    - * It stores back-reference to table entry which points to this
    - * object. This is required to support memory defragmentation.
    - */
    -struct zobj_header {
    -};
    -
    /*-- Configurable parameters */

    /* Default zram disk size: 25% of total RAM */
    --
    1.7.10.2


    \
     
     \ /
      Last update: 2012-06-21 06:21    [W:0.024 / U:2.384 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site