[Oracleasm-commits] jlbec commits r406 - in trunk: . kapi-compat/include

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2009-01-07 13:50:59 -0800 (Wed, 07 Jan 2009)
New Revision: 406

Added:
   trunk/kapi-compat/include/kmem_cache_s.h
Modified:
   trunk/Makefile
   trunk/configure.in
Log:

oracleasm: Older kernels call a kmem_cache structure "kmem_cache_s"

We have a kapi setup for when kmem_cache_t disappeared.  At that time,
the declaration:

  typedef struct kmem_cache kmem_cache_t

disappeared, and the functions were declared with the structure.

However, older kernels did this:

  typedef struct kmem_cache_s kmem_cache_t

Let's check for that.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-01-07 21:43:23 UTC (rev 405)
+++ trunk/Makefile	2009-01-07 21:50:59 UTC (rev 406)
@@ -25,6 +25,7 @@
 	kapi-compat/include/i_mutex.h			\
 	kapi-compat/include/i_private.h			\
 	kapi-compat/include/kmem_cache_create.h		\
+	kapi-compat/include/kmem_cache_s.h		\
 	kapi-compat/include/slab_ctor_three_arg.h	\
 	kapi-compat/include/slab_ctor_two_arg.h		\
 	kapi-compat/include/slab_ctor_verify.h

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-01-07 21:43:23 UTC (rev 405)
+++ trunk/configure.in	2009-01-07 21:50:59 UTC (rev 406)
@@ -219,6 +219,12 @@
     [^.*unsigned long, unsigned int, int, gfp_t)])
   KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $bio_map_user_compat_header"
 
+  kmem_cache_s_header=
+  OCFS2_CHECK_KERNEL_INCLUDES([struct kmem_cache_s], linux/slab.h,
+    $kernelincludes, kmem_cache_s_header="kmem_cache_s.h", ,
+    [struct kmem_cache_s])
+  KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $kmem_cache_s_header"
+
   kmem_cache_create_header=
   OCFS2_CHECK_KERNEL_INCLUDES([kmem_cache_create() with dtor arg in slab.h],
     linux/slab.h, $kernelincludes, kmem_cache_create_header="kmem_cache_create.h", ,

Added: trunk/kapi-compat/include/kmem_cache_s.h
===================================================================
--- trunk/kapi-compat/include/kmem_cache_s.h	                        (rev 0)
+++ trunk/kapi-compat/include/kmem_cache_s.h	2009-01-07 21:50:59 UTC (rev 406)
@@ -0,0 +1,6 @@
+#ifndef KAPI_KMEM_CACHE_S_H
+#define KAPI_KMEM_CACHE_S_H
+
+#define kmem_cache kmem_cache_s
+
+#endif /* KAPI_KMEM_CACHE_S_H */