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

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2008-12-03 16:50:03 -0800 (Wed, 03 Dec 2008)
New Revision: 400

Added:
   trunk/kapi-compat/include/blkdev_get.h
Modified:
   trunk/configure.in
   trunk/kernel/oracleasm.c
Log:

oracleasm: New blkdev_get()

The kernel has changed blkdev_get().  The third (useless) argument has
been dropped.  We create a compat wrapper that adds the old argument for
older kernels.



Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-12-04 00:39:39 UTC (rev 399)
+++ trunk/configure.in	2008-12-04 00:50:03 UTC (rev 400)
@@ -225,6 +225,12 @@
     [^.*void (\*)(void \*, .*kmem_cache.* \*, unsigned long),])
   KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $kmem_cache_create_header"
 
+  blkdev_get_compat_header=
+  OCFS2_CHECK_KERNEL_INCLUDES([for three argument blkdev_get], linux/fs.h,
+    $kernelincludes, blkdev_get_compat_header="blkdev_get.h", ,
+    [extern int blkdev_get(struct block_device \*, f\?mode_t, unsigned)])
+  KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $blkdev_get_compat_header"
+ 
   slab_ctor_header=
   OCFS2_CHECK_KERNEL_INCLUDES([SLAB_CTOR_VERIFY in slab.h], linux/slab.h,
     $kernel_includes, slab_ctor_headre=slab_ctor_verify.h, ,

Added: trunk/kapi-compat/include/blkdev_get.h
===================================================================
--- trunk/kapi-compat/include/blkdev_get.h	                        (rev 0)
+++ trunk/kapi-compat/include/blkdev_get.h	2008-12-04 00:50:03 UTC (rev 400)
@@ -0,0 +1,6 @@
+#ifndef KAPI_BLKDEV_GET_H
+#define KAPI_BLKDEV_GET_H
+
+#define kapi_asm_blkdev_get(a, b)	blkdev_get(a, b, 0)
+
+#endif

Modified: trunk/kernel/oracleasm.c
===================================================================
--- trunk/kernel/oracleasm.c	2008-12-04 00:39:39 UTC (rev 399)
+++ trunk/kernel/oracleasm.c	2008-12-04 00:50:03 UTC (rev 400)
@@ -736,6 +736,9 @@
 	return pow_two_sectors;
 }
 
+#ifndef kapi_asm_blkdev_get
+# define kapi_asm_blkdev_get blkdev_get
+#endif
 static int asm_open_disk(struct file *file, struct block_device *bdev)
 {
 	int ret;
@@ -747,7 +750,7 @@
 
 	mlog_entry("(0x%p, 0x%p)\n", file, bdev);
 
-	ret = blkdev_get(bdev, FMODE_WRITE | FMODE_READ, 0);
+	ret = kapi_asm_blkdev_get(bdev, FMODE_WRITE | FMODE_READ);
 	if (ret)
 		goto out;