Skip to content

Commit

Permalink
zram: free meta table in zram_meta_free
Browse files Browse the repository at this point in the history
zram_meta_alloc() and zram_meta_free() are a pair.  In
zram_meta_alloc(), meta table is allocated.  So it it better to free it
in zram_meta_free().

Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Acked-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Ganesh Mahendran authored and Linus Torvalds committed Feb 13, 2015
1 parent b817995 commit 1fec117
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions drivers/block/zram/zram_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,21 @@ static inline int valid_io_request(struct zram *zram,
return 1;
}

static void zram_meta_free(struct zram_meta *meta)
static void zram_meta_free(struct zram_meta *meta, u64 disksize)
{
size_t num_pages = disksize >> PAGE_SHIFT;
size_t index;

/* Free all pages that are still in this zram device */
for (index = 0; index < num_pages; index++) {
unsigned long handle = meta->table[index].handle;

if (!handle)
continue;

zs_free(meta->mem_pool, handle);
}

zs_destroy_pool(meta->mem_pool);
vfree(meta->table);
kfree(meta);
Expand Down Expand Up @@ -704,9 +717,6 @@ static void zram_bio_discard(struct zram *zram, u32 index,

static void zram_reset_device(struct zram *zram, bool reset_capacity)
{
size_t index;
struct zram_meta *meta;

down_write(&zram->init_lock);

zram->limit_pages = 0;
Expand All @@ -716,20 +726,9 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity)
return;
}

meta = zram->meta;
/* Free all pages that are still in this zram device */
for (index = 0; index < zram->disksize >> PAGE_SHIFT; index++) {
unsigned long handle = meta->table[index].handle;
if (!handle)
continue;

zs_free(meta->mem_pool, handle);
}

zcomp_destroy(zram->comp);
zram->max_comp_streams = 1;

zram_meta_free(zram->meta);
zram_meta_free(zram->meta, zram->disksize);
zram->meta = NULL;
/* Reset stats */
memset(&zram->stats, 0, sizeof(zram->stats));
Expand Down Expand Up @@ -801,7 +800,7 @@ static ssize_t disksize_store(struct device *dev,
up_write(&zram->init_lock);
zcomp_destroy(comp);
out_free_meta:
zram_meta_free(meta);
zram_meta_free(meta, disksize);
return err;
}

Expand Down

0 comments on commit 1fec117

Please sign in to comment.