From: Oleg Drokin <green@linuxhacker.ru>
Date: Wed, 16 Sep 2015 16:26:55 +0000 (-0400)
Subject: staging/lustre: Remove users of OBD_ALLOC/FREE_PTR lu_object.h
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fca5ba8a1d047b4eddc1774d64eccdf9724a9577;p=openwrt%2Fstaging%2Fblogic.git

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 <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

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 */