[Ocfs2-commits] manish commits r1391 - in trunk: . src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-08-26 21:20:00 -0500 (Thu, 26 Aug 2004)
New Revision: 1391

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/src/Makefile
Log:
Add checks for generic_file_write_nolock and compat emulation via
do_generic_file_write


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2004-08-27 02:16:53 UTC (rev 1390)
+++ trunk/Config.make.in	2004-08-27 02:20:00 UTC (rev 1391)
@@ -56,6 +56,8 @@
 
 HAVE_NPTL = @HAVE_NPTL@
 
+COMPAT_SAFE_WRITE = @COMPAT_SAFE_WRITE@
+
 OCFS_DEBUG = @OCFS_DEBUG@
 OCFS_LARGEIO = @OCFS_LARGEIO@
 OCFS_AIO = @OCFS_AIO@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-08-27 02:16:53 UTC (rev 1390)
+++ trunk/configure.in	2004-08-27 02:20:00 UTC (rev 1391)
@@ -255,6 +255,26 @@
 fi
 AC_SUBST(HAVE_NPTL)
 
+COMPAT_SAFE_WRITE=
+AC_MSG_CHECKING([for safe write ordering])
+if egrep "EXPORT_SYMBOL.*\(generic_file_write_nolock\);" "$kerneldir/mm/filemap.c" >/dev/null 2>&1; then
+  have_safe_write=yes
+elif egrep "EXPORT_SYMBOL.*\(generic_file_write_nolock\);" "$kerneldir/kernel/ksyms.c" >/dev/null 2>&1; then
+  have_safe_write=yes
+elif egrep "EXPORT_SYMBOL.*\(do_generic_file_write\);" "$kerneldir/kernel/ksyms.c" >/dev/null 2>&1; then
+  have_safe_write=yes
+  COMPAT_SAFE_WRITE=yes
+else
+  have_safe_write=no
+fi
+AC_MSG_RESULT($have_safe_write)
+
+if test "$have_safe_write" = "no"; then
+  AC_MSG_ERROR([Can't guarantee safe writes, please try a 2.6.x kernel])
+fi
+
+AC_SUBST(COMPAT_SAFE_WRITE)
+
 AC_MSG_CHECKING([for kernel module symbol versions])
 AC_EGREP_CPP(kernel_has_modversions,
 [#include <linux/autoconf.h>

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2004-08-27 02:16:53 UTC (rev 1390)
+++ trunk/src/Makefile	2004-08-27 02:20:00 UTC (rev 1391)
@@ -40,6 +40,10 @@
 GLOBAL_DEFINES += -DHAVE_NPTL
 endif
 
+ifdef COMPAT_SAFE_WRITE
+GLOBAL_DEFINES += -DOCFS_COMPAT_SAFE_WRITE
+endif
+
 ifneq ($(QUIET),1)
 GLOBAL_DEFINES += -DDEBUG_LOCK_BUFFER
 GLOBAL_DEFINES += -DVERBOSE_BH_JBD_TRACE