diff options
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c | 4 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/llog.c | 4 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/obdecho/echo_client.c | 5 |
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 | |