diff options
| author | Joe Perches | 2013-02-11 18:41:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-02-11 19:10:33 +0100 |
| commit | 78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b (patch) | |
| tree | 6534f66eb765163602ad1af98c651bea6ae09416 /drivers/staging/zcache | |
| parent | Merge tag 'iio-for-3.9d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic... (diff) | |
| download | kernel-qcow2-linux-78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b.tar.gz kernel-qcow2-linux-78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b.tar.xz kernel-qcow2-linux-78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b.zip | |
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/zcache')
| -rw-r--r-- | drivers/staging/zcache/zcache-main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index c1ac905759bd..f3204aca6f9c 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -1304,10 +1304,8 @@ int zcache_new_pool(uint16_t cli_id, uint32_t flags) goto out; atomic_inc(&cli->refcount); pool = kmalloc(sizeof(struct tmem_pool), GFP_ATOMIC); - if (pool == NULL) { - pr_info("%s: pool creation failed: out of memory\n", namestr); + if (pool == NULL) goto out; - } for (poolid = 0; poolid < MAX_POOLS_PER_CLIENT; poolid++) if (cli->tmem_pools[poolid] == NULL) @@ -1380,10 +1378,9 @@ int zcache_autocreate_pool(unsigned int cli_id, unsigned int pool_id, bool eph) goto out; } pool = kmalloc(sizeof(struct tmem_pool), GFP_KERNEL); - if (pool == NULL) { - pr_info("%s: pool creation failed: out of memory\n", namestr); + if (pool == NULL) goto out; - } + atomic_set(&pool->refcount, 0); pool->client = cli; pool->pool_id = pool_id; |