aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBhumika Goyal <[email protected]>2016-02-29 01:14:33 +0530
committerGreg Kroah-Hartman <[email protected]>2016-03-01 19:38:34 -0800
commit2f27a3e298e33fa6caa4e1c57ff6773a4bcbf69c (patch)
tree2da7817212ef51c75bc530edb0f1e2f65366e3b2
parent04697f7b61b07aedf6fbf2bba73f07b231e44d6a (diff)
Staging: lustre: Remove print statement on function failure
The memory allocation functions generates a call stack containing all the context information on failure, so print statements can be removed on failure of these functions. Also remove unwanted {} around if block after removal of these statements. Done using coccinelle: @@ expression e,e1,e2; identifier x; @@ e=\(kmalloc\|kmalloc_array\|kzalloc\| devm_kzalloc\)(...); ...when!=e=e1 if(!e) -{ - \(printk\|DBG_8723A\|pr_err\|CERROR\|DBG_88E\)(...); ( goto x; | return e2; | return; ) -} Signed-off-by: Bhumika Goyal <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c4
-rw-r--r--drivers/staging/lustre/lustre/obdclass/llog.c4
-rw-r--r--drivers/staging/lustre/lustre/obdecho/echo_client.c5
3 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
index ec758019bad6..1d2f70fda944 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
@@ -251,10 +251,8 @@ static int cfs_crypto_test_hashes(void)
unsigned int data_len = 1 * 128 * 1024;
data = kmalloc(data_len, 0);
- if (!data) {
- CERROR("Failed to allocate mem\n");
+ if (!data)
return -ENOMEM;
- }
for (j = 0; j < data_len; j++)
data[j] = j & 0xff;
diff --git a/drivers/staging/lustre/lustre/obdclass/llog.c b/drivers/staging/lustre/lustre/obdclass/llog.c
index f7ee605c74d0..992573eae1b1 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog.c
@@ -365,10 +365,8 @@ int llog_process_or_fork(const struct lu_env *env,
int rc;
lpi = kzalloc(sizeof(*lpi), GFP_NOFS);
- if (!lpi) {
- CERROR("cannot alloc pointer\n");
+ if (!lpi)
return -ENOMEM;
- }
lpi->lpi_loghandle = loghandle;
lpi->lpi_cb = cb;
lpi->lpi_cbdata = data;
diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c
index ec2f255d65ee..3edd7c80ce18 100644
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@ -1768,11 +1768,8 @@ static int echo_client_setup(const struct lu_env *env,
ec->ec_unique = 0;
ocd = kzalloc(sizeof(*ocd), GFP_NOFS);
- if (!ocd) {
- CERROR("Can't alloc ocd connecting to %s\n",
- lustre_cfg_string(lcfg, 1));
+ if (!ocd)
return -ENOMEM;
- }
ocd->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_REQPORTAL |
OBD_CONNECT_BRW_SIZE |