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

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2007-02-06 18:31:52 -0800 (Tue, 06 Feb 2007)
New Revision: 370

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

oracleasm: [inode_diet] Remove i_blksize

The inode diet patches removed i_blksize.  Introduce a helper define
set_i_blksize() that does nothing.  Add i_blksize.h for compatiblity that
defines set_i_blksize() to actually set i_blksize for older kernels.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-02-07 02:18:01 UTC (rev 369)
+++ trunk/Makefile	2007-02-07 02:31:52 UTC (rev 370)
@@ -17,6 +17,7 @@
 SUBDIRS = include kernel documents vendor
 
 KAPI_COMPAT_FILES =			\
+	kapi-compat/include/i_blksize.h	\
 	kapi-compat/include/i_mutex.h	\
 	kapi-compat/include/i_private.h
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-02-07 02:18:01 UTC (rev 369)
+++ trunk/configure.in	2007-02-07 02:31:52 UTC (rev 370)
@@ -167,6 +167,11 @@
     $kernelincludes, , private_compat_header="i_private.h", [i_private])
   KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $private_compat_header"
 
+  blksize_compat_header=
+  OCFS2_CHECK_KERNEL_INCLUDES([for i_blksize], linux/fs.h,
+    $kernelincludes, blksize_compat_header="i_blksize.h", , [i_blksize])
+  KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $blksize_compat_header"
+
   # using -include has two advantages:
   #  the source doesn't need to know to include compat headers
   #  the compat header file names don't go through the search path

Added: trunk/kapi-compat/include/i_blksize.h
===================================================================
--- trunk/kapi-compat/include/i_blksize.h	2007-02-07 02:18:01 UTC (rev 369)
+++ trunk/kapi-compat/include/i_blksize.h	2007-02-07 02:31:52 UTC (rev 370)
@@ -0,0 +1,6 @@
+#ifndef KAPI_IBLKSIZE_H
+#define KAPI_IBLKSIZE_H
+
+#define set_i_blksize(i, bs) (i)->i_blksize = bs
+
+#endif /* KAPI_IMUTEX_H */

Modified: trunk/kernel/oracleasm.c
===================================================================
--- trunk/kernel/oracleasm.c	2007-02-07 02:18:01 UTC (rev 369)
+++ trunk/kernel/oracleasm.c	2007-02-07 02:31:52 UTC (rev 370)
@@ -80,6 +80,15 @@
 
 #include "linux/oracleasm/module_version.h"
 
+/*
+ * Modern kernels don't need this.  Older kernels will have it defined
+ * by the compat code.
+ */
+#ifndef set_i_blksize
+# define set_i_blksize(i, bs) do { /* Nothing */ } while (0)
+#endif
+
+
 #include "masklog.h"
 #include "proc.h"
 #if 0
@@ -96,7 +105,6 @@
 
 
 
-
 /*
  * Compat32
  */
@@ -531,7 +539,7 @@
 	inode->i_mode = mode;
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
-	inode->i_blksize = PAGE_CACHE_SIZE;
+	set_i_blksize(inode, PAGE_CACHE_SIZE);
 	inode->i_blocks = 0;
 	inode->i_rdev = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@ -565,7 +573,7 @@
 	inode->i_mode = mode;
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
-	inode->i_blksize = PAGE_CACHE_SIZE;
+	set_i_blksize(inode, PAGE_CACHE_SIZE);
 	inode->i_blocks = 0;
 	inode->i_rdev = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@ -2611,7 +2619,7 @@
 	inode->i_ino = (unsigned long)inode;
 	inode->i_mode = S_IFDIR | 0755;
 	inode->i_uid = inode->i_gid = 0;
-	inode->i_blksize = PAGE_CACHE_SIZE;
+	set_i_blksize(inode, PAGE_CACHE_SIZE);
 	inode->i_blocks = 0;
 	inode->i_rdev = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

Modified: trunk/kernel/transaction_file.c
===================================================================
--- trunk/kernel/transaction_file.c	2007-02-07 02:18:01 UTC (rev 369)
+++ trunk/kernel/transaction_file.c	2007-02-07 02:31:52 UTC (rev 370)
@@ -150,7 +150,7 @@
 	inode->i_mode = S_IFREG | mode;
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
-	inode->i_blksize = PAGE_CACHE_SIZE;
+	set_i_blksize(inode, PAGE_CACHE_SIZE);
 	inode->i_blocks = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 	inode->i_fop = &transaction_ops;