From af13af52e488ed2d2044924ea73ecb8589fc4d3b Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Wed, 16 Sep 2015 12:26:56 -0400 Subject: [PATCH] staging/lustre/llite: Get rid of OBD_ALLOC/FREE_PTR The remaining users in ll_open_cleanup and obd_mod_alloc are converted to regular kzalloc/kfree. Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/include/obd.h | 4 ++-- drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h index 76a2546e0f41..145c9be8fc5d 100644 --- a/drivers/staging/lustre/lustre/include/obd.h +++ b/drivers/staging/lustre/lustre/include/obd.h @@ -1408,7 +1408,7 @@ static inline struct md_open_data *obd_mod_alloc(void) { struct md_open_data *mod; - OBD_ALLOC_PTR(mod); + mod = kzalloc(sizeof(*mod), GFP_NOFS); if (mod == NULL) return NULL; atomic_set(&mod->mod_refcount, 1); @@ -1421,7 +1421,7 @@ static inline struct md_open_data *obd_mod_alloc(void) if (atomic_dec_and_test(&(mod)->mod_refcount)) { \ if ((mod)->mod_open_req) \ ptlrpc_req_finished((mod)->mod_open_req); \ - OBD_FREE_PTR(mod); \ + kfree(mod); \ } \ }) diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index 725481d3916e..aa68608c3cbd 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -1996,7 +1996,7 @@ void ll_open_cleanup(struct super_block *sb, struct ptlrpc_request *open_req) struct obd_export *exp = ll_s2sbi(sb)->ll_md_exp; body = req_capsule_server_get(&open_req->rq_pill, &RMF_MDT_BODY); - OBD_ALLOC_PTR(op_data); + op_data = kzalloc(sizeof(*op_data), GFP_NOFS); if (!op_data) { CWARN("%s: cannot allocate op_data to release open handle for " DFID "\n", -- 2.34.1