Commit 00c40c16 authored by Julia Lawall's avatar Julia Lawall Committed by Greg Kroah-Hartman

staging: lustre: lclient: Use kzalloc and kfree

Replace OBD_ALLOC, OBD_ALLOC_WAIT, OBD_ALLOC_PTR, and OBD_ALLOC_PTR_WAIT by
kalloc/kcalloc, and OBD_FREE and OBD_FREE_PTR by kfree.

A simplified version of the semantic patch that makes these changes is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@ expression ptr,size; @@
- OBD_ALLOC(ptr,size)
+ ptr = kzalloc(size, GFP_NOFS)

@@ expression ptr, size; @@
- OBD_FREE(ptr, size);
+ kfree(ptr);
// </smpl>
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e651013
...@@ -202,7 +202,7 @@ struct lu_device *ccc_device_alloc(const struct lu_env *env, ...@@ -202,7 +202,7 @@ struct lu_device *ccc_device_alloc(const struct lu_env *env,
struct cl_site *site; struct cl_site *site;
int rc; int rc;
OBD_ALLOC_PTR(vdv); vdv = kzalloc(sizeof(*vdv), GFP_NOFS);
if (vdv == NULL) if (vdv == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
...@@ -211,7 +211,7 @@ struct lu_device *ccc_device_alloc(const struct lu_env *env, ...@@ -211,7 +211,7 @@ struct lu_device *ccc_device_alloc(const struct lu_env *env,
ccc2lu_dev(vdv)->ld_ops = luops; ccc2lu_dev(vdv)->ld_ops = luops;
vdv->cdv_cl.cd_ops = clops; vdv->cdv_cl.cd_ops = clops;
OBD_ALLOC_PTR(site); site = kzalloc(sizeof(*site), GFP_NOFS);
if (site != NULL) { if (site != NULL) {
rc = cl_site_init(site, &vdv->cdv_cl); rc = cl_site_init(site, &vdv->cdv_cl);
if (rc == 0) if (rc == 0)
...@@ -219,7 +219,7 @@ struct lu_device *ccc_device_alloc(const struct lu_env *env, ...@@ -219,7 +219,7 @@ struct lu_device *ccc_device_alloc(const struct lu_env *env,
else { else {
LASSERT(lud->ld_site == NULL); LASSERT(lud->ld_site == NULL);
CERROR("Cannot init lu_site, rc %d.\n", rc); CERROR("Cannot init lu_site, rc %d.\n", rc);
OBD_FREE_PTR(site); kfree(site);
} }
} else } else
rc = -ENOMEM; rc = -ENOMEM;
...@@ -239,10 +239,10 @@ struct lu_device *ccc_device_free(const struct lu_env *env, ...@@ -239,10 +239,10 @@ struct lu_device *ccc_device_free(const struct lu_env *env,
if (d->ld_site != NULL) { if (d->ld_site != NULL) {
cl_site_fini(site); cl_site_fini(site);
OBD_FREE_PTR(site); kfree(site);
} }
cl_device_fini(lu2cl_dev(d)); cl_device_fini(lu2cl_dev(d));
OBD_FREE_PTR(vdv); kfree(vdv);
return next; return next;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment