FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-25 10:59:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zram: clean up zram_meta_alloc()

Browse Source 
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>
This commit is contained in:
Sergey Senozhatsky 2015-02-12 15:00:31 -08:00 committed by Linus Torvalds
parent ff59909a07
commit b817995832
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/zram/zram_drv.c
View File

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