Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8179958 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Linus Torvalds
Browse files

zram: clean up zram_meta_alloc() 



A trivial cleanup of zram_meta_alloc() error handling.

Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff59909a

drivers/block/zram/zram_drv.c

+6 −8
Original line number Diff line number Diff line
@@ -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)