diff options
| author | Joe Perches <joe@perches.com> | 2013-02-11 09:41:29 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-11 10:10:33 -0800 |
| commit | 78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b (patch) | |
| tree | 6534f66eb765163602ad1af98c651bea6ae09416 /drivers/staging/zram | |
| parent | ad463ac42771a0bb8a706cf8a985788fe5f5c1c6 (diff) | |
| download | linux-78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b.tar.bz2 | |
staging: Remove unnecessary OOM messages
alloc failures already get standardized OOM
messages and a dump_stack.
For the affected mallocs around these OOM messages:
Converted kzallocs with multiplies to kcalloc.
Converted kmallocs with multiplies to kmalloc_array.
Converted a kmalloc/strlen/strncpy to kstrdup.
Moved a spin_lock below a removed OOM message and
removed a now unnecessary spin_unlock.
Neatened alignment and whitespace.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/zram')
| -rw-r--r-- | drivers/staging/zram/zram_drv.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index 6094e80aac10..5918fd7d7e36 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -246,7 +246,6 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, */ uncmem = kmalloc(PAGE_SIZE, GFP_NOIO); if (!uncmem) { - pr_info("Error allocating temp memory!\n"); ret = -ENOMEM; goto out; } @@ -517,10 +516,8 @@ struct zram_meta *zram_meta_alloc(u64 disksize) goto out; meta->compress_workmem = kzalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL); - if (!meta->compress_workmem) { - pr_err("Error allocating compressor working memory!\n"); + if (!meta->compress_workmem) goto free_meta; - } meta->compress_buffer = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1); |