[Ocfs2-commits] manish commits r1019 - branches/format-changes/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-07 12:23:56 -0500 (Mon, 07 Jun 2004)
New Revision: 1019

Modified:
   branches/format-changes/src/ocfs.h
Log:
inlined ocfs_malloc, removed unused ocfs_vmalloc


Modified: branches/format-changes/src/ocfs.h
===================================================================
--- branches/format-changes/src/ocfs.h	2004-06-06 19:21:09 UTC (rev 1018)
+++ branches/format-changes/src/ocfs.h	2004-06-07 17:23:56 UTC (rev 1019)
@@ -464,23 +464,15 @@
 */
 
 
-#define ocfs_malloc(size)						      \
-({									      \
-	void *__ptr = kmalloc((size_t)(size), GFP_KERNEL);		      \
-	if (__ptr)							      \
-		memset(__ptr, 0, size);					      \
-	__ptr;								      \
-})
-#define ocfs_vmalloc(size)						      \
-({									      \
-	void *__ptr = vmalloc((size_t)(size));				      \
-	if (__ptr)							      \
-		memset(__ptr, 0, size);					      \
-	__ptr;								      \
-})
+static inline void *ocfs_malloc(size_t size)
+{
+	void *p = kmalloc(size, GFP_KERNEL);
+	if (p)
+		memset(p, 0, size);
+	return p;
+}
 
 
-
 typedef enum _ocfs_protocol
 {
 	OCFS_TCP = 1,