[Ocfs2-commits] smushran commits r3110 - in branches/ocfs2-1.2: . fs/ocfs2 kapi-compat/include

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2008-11-11 16:43:27 -0800 (Tue, 11 Nov 2008)
New Revision: 3110

Added:
   branches/ocfs2-1.2/kapi-compat/include/le32_and_cpu.h
Modified:
   branches/ocfs2-1.2/Makefile
   branches/ocfs2-1.2/configure.in
   branches/ocfs2-1.2/fs/ocfs2/endian.h
Log:
ocfs2: le32_and_cpu() moved to kapi-compat

le32_and_cpu() moved to kapi-compat to allow building with kernels
that already define this function.

Signed-off-by: jlbec

Modified: branches/ocfs2-1.2/Makefile
===================================================================
--- branches/ocfs2-1.2/Makefile	2008-11-12 00:42:37 UTC (rev 3109)
+++ branches/ocfs2-1.2/Makefile	2008-11-12 00:43:27 UTC (rev 3110)
@@ -20,7 +20,8 @@
 	kapi-compat/include/simple_pin_fs.h		\
 	kapi-compat/include/reboot.h			\
 	kapi-compat/include/le16_add_cpu.h		\
-	kapi-compat/include/le32_add_cpu.h
+	kapi-compat/include/le32_add_cpu.h		\
+	kapi-compat/include/le32_and_cpu.h
 
 PATCH_FILES = \
 	patches/export_generic_drop_inode.patch

Modified: branches/ocfs2-1.2/configure.in
===================================================================
--- branches/ocfs2-1.2/configure.in	2008-11-12 00:42:37 UTC (rev 3109)
+++ branches/ocfs2-1.2/configure.in	2008-11-12 00:43:27 UTC (rev 3110)
@@ -294,6 +294,11 @@
   , le32_add_cpu_compat_header="le32_add_cpu.h", [^static inline void le32_add_cpu(])
 KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $le32_add_cpu_compat_header"
 
+le32_and_cpu_compat_header=""
+OCFS2_CHECK_KERNEL([le32_and_cpu() in byteorder/generic.h], byteorder/generic.h,
+  , le32_and_cpu_compat_header="le32_and_cpu.h", [^static inline void le32_and_cpu(])
+KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $le32_and_cpu_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

Modified: branches/ocfs2-1.2/fs/ocfs2/endian.h
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/endian.h	2008-11-12 00:42:37 UTC (rev 3109)
+++ branches/ocfs2-1.2/fs/ocfs2/endian.h	2008-11-12 00:43:27 UTC (rev 3110)
@@ -22,11 +22,6 @@
 #ifndef OCFS2_ENDIAN_H
 #define OCFS2_ENDIAN_H
 
-static inline void le32_and_cpu(__le32 *var, u32 val)
-{
-	*var = cpu_to_le32(le32_to_cpu(*var) & val);
-}
-
 static inline void be32_add_cpu(__be32 *var, u32 val)
 {
 	*var = cpu_to_be32(be32_to_cpu(*var) + val);

Added: branches/ocfs2-1.2/kapi-compat/include/le32_and_cpu.h
===================================================================
--- branches/ocfs2-1.2/kapi-compat/include/le32_and_cpu.h	                        (rev 0)
+++ branches/ocfs2-1.2/kapi-compat/include/le32_and_cpu.h	2008-11-12 00:43:27 UTC (rev 3110)
@@ -0,0 +1,9 @@
+#ifndef KAPI_LE32_AND_CPU_H
+#define KAPI_LE32_AND_CPU_H
+
+static inline void le32_and_cpu(__le32 *var, u32 val)
+{
+	*var = cpu_to_le32(le32_to_cpu(*var) & val);
+}
+
+#endif