[Ocfs2-commits] mfasheh commits r2692 - trunk

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2005-11-08 18:29:44 -0600 (Tue, 08 Nov 2005)
New Revision: 2692

Modified:
   trunk/configure.in
Log:
* default the generic_delete_inode() workaround to off               

* allow the user to explicitly enable it, otherwise configure will try to   
  detect the correct setting.

Signed-off-by: zab



Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-11-09 00:23:47 UTC (rev 2691)
+++ trunk/configure.in	2005-11-09 00:29:44 UTC (rev 2692)
@@ -272,24 +272,33 @@
 # This at least has a chance of working without intervention when building
 # against a full source tree.  Someone who cares could replace this with
 # a version check, I guess, though getting the right -mm is irritating.
-GENERIC_DELETE_INODE_TRUNCATES=yes
-if [ test -f $kernelsourcedir/fs/inode.c ]; then
-	AC_MSG_CHECKING(truncate call in generic_delete_inode)
-	first=`awk '(/void generic_delete_inode/) { gdi=1 } 
+
+AC_MSG_CHECKING(truncate call in generic_delete_inode)
+AC_ARG_WITH(truncate-in-delete, [  --with-truncate-in-delete                        Build with workarounds for generic_delete_inode])
+GENERIC_DELETE_INODE_TRUNCATES=
+if test "x$with_truncate_in_delete" = "xyes"; then
+	AC_MSG_RESULT(yes; workaround enabled by configure option)
+	GENERIC_DELETE_INODE_TRUNCATES=yes
+else
+	if [ test -f $kernelsourcedir/fs/inode.c ]; then
+	   first=`awk '(/void generic_delete_inode/) { gdi=1 } 
 		(/\<delete\(inode\);/) {if (gdi == 1) { print "delete" ; exit }}
 		(/truncate_inode_pages\(&inode/) { if (gdi == 1) {print "truncate"; exit}}' $kernelsourcedir/fs/inode.c`
-	case "$first" in
+		case "$first" in
 		delete)
-			AC_MSG_RESULT(no; disabling workaround)
-			GENERIC_DELETE_INODE_TRUNCATES=
-			;;
+				AC_MSG_RESULT(no; disabling workaround)
+				;;
 		truncate)
-			AC_MSG_RESULT(yes; leaving workaround enabled)
-			;;
+				GENERIC_DELETE_INODE_TRUNCATES=yes
+				AC_MSG_RESULT(yes; leaving workaround enabled)
+							;;
 		*)
-			AC_MSG_RESULT(unknown; leaving workaround enabled)
-			;;
-	esac
+				AC_MSG_RESULT(unknown; leaving workaround disabled)
+				;;
+		esac
+	else 
+	     AC_MSG_RESULT(no; if you crash in fs/inode.c please enable me)
+	fi
 fi
 AC_SUBST(GENERIC_DELETE_INODE_TRUNCATES)