From: Julia Lawall Date: Sat, 20 Jun 2015 16:59:05 +0000 (+0200) Subject: staging: lustre: mdc: Use !x to check for kzalloc failure X-Git-Tag: firefly_0821_release~176^2~1221^2~746 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bb144d09a95c6016528ec869b4398ae679cc4df7;p=firefly-linux-kernel-4.4.55.git staging: lustre: mdc: Use !x to check for kzalloc failure !x is more normal for kzalloc failure in the kernel. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x; statement S1, S2; @@ x = kzalloc(...); if ( - x == NULL + !x ) S1 else S2 // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c index 7f208a6621e6..204d51262560 100644 --- a/drivers/staging/lustre/lustre/mdc/mdc_request.c +++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c @@ -1202,7 +1202,7 @@ static int mdc_ioc_fid2path(struct obd_export *exp, struct getinfo_fid2path *gf) /* Key is KEY_FID2PATH + getinfo_fid2path description */ keylen = cfs_size_round(sizeof(KEY_FID2PATH)) + sizeof(*gf); key = kzalloc(keylen, GFP_NOFS); - if (key == NULL) + if (!key) return -ENOMEM; memcpy(key, KEY_FID2PATH, sizeof(KEY_FID2PATH)); memcpy(key + cfs_size_round(sizeof(KEY_FID2PATH)), gf, sizeof(*gf)); @@ -1605,7 +1605,7 @@ static int mdc_changelog_send_thread(void *csdata) cs->cs_fp, cs->cs_startrec); cs->cs_buf = kzalloc(KUC_CHANGELOG_MSG_MAXSIZE, GFP_NOFS); - if (cs->cs_buf == NULL) { + if (!cs->cs_buf) { rc = -ENOMEM; goto out; } @@ -1934,7 +1934,7 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len, struct obd_quotactl *oqctl; oqctl = kzalloc(sizeof(*oqctl), GFP_NOFS); - if (oqctl == NULL) { + if (!oqctl) { rc = -ENOMEM; goto out; }