zram: free meta table in zram_meta_free

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>
(cherry picked from commit 1fec117281d9f5349c35279c9521f4096fa33357)
Signed-off-by: Alex Shi <alex.shi@linaro.org>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 8a1266ce8bbe52293969225c67d857c19f13e441..3e075d65a1582118af6a9a806be4addea2c13fc3 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -308,8 +308,21 @@ static inline int valid_io_request(struct zram *zram, struct bio *bio)
        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);
@@ -708,9 +721,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;
@@ -720,20 +730,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));
@@ -805,7 +804,7 @@ out_destroy_comp:
        up_write(&zram->init_lock);
        zcomp_destroy(comp);
 out_free_meta:
-       zram_meta_free(meta);
+       zram_meta_free(meta, disksize);
        return err;
 }