staging: lustre: ldlm: Use !x to check for kzalloc failure
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sat, 20 Jun 2015 16:59:02 +0000 (18:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jul 2015 02:35:52 +0000 (19:35 -0700)
!x is more normal for kzalloc failure in the kernel.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x;
statement S1, S2;
@@

x = kzalloc(...);
if (
- x == NULL
+ !x
 ) S1 else S2
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c

index bb2246d3b22b51978ef00122710c6c01c67e3f61..cd340fc8ceab45238e51449434f130973b61cda4 100644 (file)
@@ -1528,7 +1528,7 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns,
        if (lvb_len) {
                lock->l_lvb_len = lvb_len;
                lock->l_lvb_data = kzalloc(lvb_len, GFP_NOFS);
-               if (lock->l_lvb_data == NULL)
+               if (!lock->l_lvb_data)
                        goto out;
        }
 
@@ -1813,7 +1813,7 @@ int ldlm_run_ast_work(struct ldlm_namespace *ns, struct list_head *rpc_list,
                return 0;
 
        arg = kzalloc(sizeof(*arg), GFP_NOFS);
-       if (arg == NULL)
+       if (!arg)
                return -ENOMEM;
 
        atomic_set(&arg->restart, 0);
index b7b6ca1196b7fba3f291b7f4afa7193d07b49e30..941eb4e720392f83355f85bc95b6471dadeeb24f 100644 (file)
@@ -225,7 +225,7 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req,
                        void *lvb_data;
 
                        lvb_data = kzalloc(lvb_len, GFP_NOFS);
-                       if (lvb_data == NULL) {
+                       if (!lvb_data) {
                                LDLM_ERROR(lock, "No memory: %d.\n", lvb_len);
                                rc = -ENOMEM;
                                goto out;
@@ -453,7 +453,7 @@ static int ldlm_bl_to_thread(struct ldlm_namespace *ns,
                struct ldlm_bl_work_item *blwi;
 
                blwi = kzalloc(sizeof(*blwi), GFP_NOFS);
-               if (blwi == NULL)
+               if (!blwi)
                        return -ENOMEM;
                init_blwi(blwi, ns, ld, cancels, count, lock, cancel_flags);
 
@@ -1053,7 +1053,7 @@ static int ldlm_setup(void)
                return -EALREADY;
 
        ldlm_state = kzalloc(sizeof(*ldlm_state), GFP_NOFS);
-       if (ldlm_state == NULL)
+       if (!ldlm_state)
                return -ENOMEM;
 
        ldlm_kobj = kobject_create_and_add("ldlm", lustre_kobj);
@@ -1123,7 +1123,7 @@ static int ldlm_setup(void)
 
 
        blp = kzalloc(sizeof(*blp), GFP_NOFS);
-       if (blp == NULL) {
+       if (!blp) {
                rc = -ENOMEM;
                goto out;
        }
index 1605b9c692715512109da73215a7e9ec1c597738..4519d779a0ef7b924d2149d6685a1a7daff20608 100644 (file)
@@ -1422,7 +1422,7 @@ static int ldlm_pools_thread_start(void)
                return -EALREADY;
 
        ldlm_pools_thread = kzalloc(sizeof(*ldlm_pools_thread), GFP_NOFS);
-       if (ldlm_pools_thread == NULL)
+       if (!ldlm_pools_thread)
                return -ENOMEM;
 
        init_completion(&ldlm_pools_comp);