zram: clean up zram_meta_alloc()

A trivial cleanup of zram_meta_alloc() error handling.

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index bd8bda386e02180c989f2701c7ef056fbe51b24d..369fe564279973bec0f33f2c40a185cf08c3185e 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -318,31 +318,29 @@ static struct zram_meta *zram_meta_alloc(u64 disksize)
 {
        size_t num_pages;
        struct zram_meta *meta = kmalloc(sizeof(*meta), GFP_KERNEL);
+
        if (!meta)
-               goto out;
+               return NULL;
 
        num_pages = disksize >> PAGE_SHIFT;
        meta->table = vzalloc(num_pages * sizeof(*meta->table));
        if (!meta->table) {
                pr_err("Error allocating zram address table\n");
-               goto free_meta;
+               goto out_error;
        }
 
        meta->mem_pool = zs_create_pool(GFP_NOIO | __GFP_HIGHMEM);
        if (!meta->mem_pool) {
                pr_err("Error creating memory pool\n");
-               goto free_table;
+               goto out_error;
        }
 
        return meta;
 
-free_table:
+out_error:
        vfree(meta->table);
-free_meta:
        kfree(meta);
-       meta = NULL;
-out:
-       return meta;
+       return NULL;
 }
 
 static void update_position(u32 *index, int *offset, struct bio_vec *bvec)