From fca5ba8a1d047b4eddc1774d64eccdf9724a9577 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Wed, 16 Sep 2015 12:26:55 -0400 Subject: [PATCH] staging/lustre: Remove users of OBD_ALLOC/FREE_PTR lu_object.h These are converted to regular kzalloc/kfree calls. Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/include/lu_object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h index 96e271d7df9a..77560085082a 100644 --- a/drivers/staging/lustre/lustre/include/lu_object.h +++ b/drivers/staging/lustre/lustre/include/lu_object.h @@ -1126,7 +1126,7 @@ struct lu_context_key { \ CLASSERT(PAGE_CACHE_SIZE >= sizeof (*value)); \ \ - OBD_ALLOC_PTR(value); \ + value = kzalloc(sizeof(*value), GFP_NOFS); \ if (value == NULL) \ value = ERR_PTR(-ENOMEM); \ \ @@ -1140,7 +1140,7 @@ struct lu_context_key { { \ type *info = data; \ \ - OBD_FREE_PTR(info); \ + kfree(info); \ } \ struct __##mod##__dummy_fini {; } /* semicolon catcher */ -- 2.30.2