From acdd1b8e681405beeb1f73333947fd5a42b871e9 Mon Sep 17 00:00:00 2001 From: Amitoj Kaur Chawla Date: Sat, 13 Feb 2016 20:32:48 +0530 Subject: [PATCH] staging: lustre: obdclass: Use IS_ERR_OR_NULL Use macro IS_ERR_OR_NULL in place of tests for NULL and IS_ERR. The Coccinelle semantic patch used to make the change is as follows: // @@ expression e; @@ - e == NULL || IS_ERR(e) + IS_ERR_OR_NULL(e) // Signed-off-by: Amitoj Kaur Chawla Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/obdclass/kernelcomm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/obdclass/kernelcomm.c b/drivers/staging/lustre/lustre/obdclass/kernelcomm.c index be4867c5446c..8405eccdac19 100644 --- a/drivers/staging/lustre/lustre/obdclass/kernelcomm.c +++ b/drivers/staging/lustre/lustre/obdclass/kernelcomm.c @@ -59,7 +59,7 @@ int libcfs_kkuc_msg_put(struct file *filp, void *payload) mm_segment_t fs; int rc = -ENXIO; - if (!filp || IS_ERR(filp)) + if (IS_ERR_OR_NULL(filp)) return -EBADF; if (kuch->kuc_magic != KUC_MAGIC) { -- 2.34.1