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

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2008-12-03 16:57:59 -0800 (Wed, 03 Dec 2008)
New Revision: 401

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

oracleasm: New blkdev_put()

The kernel has added an fmode_t to blkdev_put().  We add a compat wrapper
for older kernels.



Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-12-04 00:50:03 UTC (rev 400)
+++ trunk/configure.in	2008-12-04 00:57:59 UTC (rev 401)
@@ -231,6 +231,12 @@
     [extern int blkdev_get(struct block_device \*, f\?mode_t, unsigned)])
   KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $blkdev_get_compat_header"
  
+  blkdev_put_compat_header=
+  OCFS2_CHECK_KERNEL_INCLUDES([for one argument blkdev_put], linux/fs.h,
+    $kernelincludes, blkdev_put_compat_header="blkdev_put.h", ,
+    [extern int blkdev_put(struct block_device \*)])
+  KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $blkdev_put_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_put.h
===================================================================
--- trunk/kapi-compat/include/blkdev_put.h	                        (rev 0)
+++ trunk/kapi-compat/include/blkdev_put.h	2008-12-04 00:57:59 UTC (rev 401)
@@ -0,0 +1,6 @@
+#ifndef KAPI_BLKDEV_PUT_H
+#define KAPI_BLKDEV_PUT_H
+
+#define kapi_asm_blkdev_put(a, b)	blkdev_put(a)
+
+#endif


Property changes on: trunk/kernel
___________________________________________________________________
Name: svn:ignore
   - *.sw?
.*.d
stamp-md5
.*.cmd
*.ko
.tmp_versions
oracleasm.mod.c
Modules.symvers
Module.symvers

   + *.sw?
.*.d
stamp-md5
.*.cmd
*.ko
.tmp_versions
oracleasm.mod.c
Modules.symvers
Module.symvers
Module.markers
modules.order


Modified: trunk/kernel/oracleasm.c
===================================================================
--- trunk/kernel/oracleasm.c	2008-12-04 00:50:03 UTC (rev 400)
+++ trunk/kernel/oracleasm.c	2008-12-04 00:57:59 UTC (rev 401)
@@ -330,6 +330,12 @@
 #ifndef kapi_init_asmdisk_once
 # define kapi_init_asmdisk_once init_asmdisk_once
 #endif
+#ifndef kapi_asm_blkdev_get
+# define kapi_asm_blkdev_get blkdev_get
+#endif
+#ifndef kapi_asm_blkdev_put
+# define kapi_asm_blkdev_put blkdev_put
+#endif
 
 static void asmdisk_clear_inode(struct inode *inode)
 {
@@ -353,7 +359,7 @@
 		     "Releasing disk 0x%p (bdev 0x%p, dev %X)\n",
 		     d, d->d_bdev, d->d_bdev->bd_dev);
 		bd_release(d->d_bdev);
-		blkdev_put(d->d_bdev);
+		kapi_asm_blkdev_put(d->d_bdev, FMODE_WRITE | FMODE_READ);
 		d->d_bdev = NULL;
 	}
 
@@ -736,9 +742,6 @@
 	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;
@@ -807,7 +810,7 @@
 		     "Open of disk 0x%p (bdev 0x%p, dev %X)\n",
 		     d, d->d_bdev, d->d_bdev->bd_dev);
 		bd_release(bdev);
-		blkdev_put(bdev);
+		kapi_asm_blkdev_put(bdev, FMODE_WRITE | FMODE_READ);
 	}
 
 	h->h_disk = d;
@@ -831,7 +834,7 @@
 	bd_release(bdev);
 
 out_get:
-	blkdev_put(bdev);
+	kapi_asm_blkdev_put(bdev, FMODE_WRITE | FMODE_READ);
 
 out:
 	mlog_exit(ret);