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

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2007-02-06 18:18:01 -0800 (Tue, 06 Feb 2007)
New Revision: 369

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

oracleasm: [inode_diet] Handle u.generic_ip == i_private.

This adds a kapi-compat header to use u.generic_ip in older code.  The main
code uses i_private.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-02-07 02:06:10 UTC (rev 368)
+++ trunk/Makefile	2007-02-07 02:18:01 UTC (rev 369)
@@ -17,7 +17,8 @@
 SUBDIRS = include kernel documents vendor
 
 KAPI_COMPAT_FILES =			\
-	kapi-compat/include/i_mutex.h
+	kapi-compat/include/i_mutex.h	\
+	kapi-compat/include/i_private.h
 
 #
 # Extra (non-source) files to distribute

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-02-07 02:06:10 UTC (rev 368)
+++ trunk/configure.in	2007-02-07 02:18:01 UTC (rev 369)
@@ -162,6 +162,11 @@
     $kernelincludes, , mutex_compat_header="i_mutex.h", [i_mutex])
   KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $mutex_compat_header"
 
+  private_compat_header=
+  OCFS2_CHECK_KERNEL_INCLUDES([for i_private], linux/fs.h,
+    $kernelincludes, , private_compat_header="i_private.h", [i_private])
+  KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $private_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_private.h
===================================================================
--- trunk/kapi-compat/include/i_private.h	2007-02-07 02:06:10 UTC (rev 368)
+++ trunk/kapi-compat/include/i_private.h	2007-02-07 02:18:01 UTC (rev 369)
@@ -0,0 +1,6 @@
+#ifndef KAPI_IPRIVATE_H
+#define KAPI_IPRIVATE_H
+
+#define i_private u.generic_ip
+
+#endif /* KAPI_IMUTEX_H */

Modified: trunk/kernel/transaction_file.c
===================================================================
--- trunk/kernel/transaction_file.c	2007-02-07 02:06:10 UTC (rev 368)
+++ trunk/kernel/transaction_file.c	2007-02-07 02:18:01 UTC (rev 369)
@@ -19,7 +19,7 @@
 
 #include "transaction_file.h"
 
-#define TRANSACTION_CONTEXT(i) ((i)->u.generic_ip)
+#define TRANSACTION_CONTEXT(i) ((i)->i_private)
 
 /* an argresp is stored in an allocated page and holds the 
  * size of the argument or response, along with its content