LU-12017 ldlm: DoM truncate deadlock

[fs/lustre-release.git] / config / lustre-version.m4

diff --git a/config/lustre-version.m4 b/config/lustre-version.m4
index 9507a50..d5485af 100644 (file)
--- a/config/lustre-version.m4
+++ b/config/lustre-version.m4
@@ -1,23 +1,20 @@
 #
 #

-# LUSTRE_VERSION_VARIABLES
+# LUSTRE_VERSION_CPP_MACROS

 #
 #

-AC_DEFUN([LUSTRE_VERSION_VARIABLES], [
-
+AC_DEFUN([LUSTRE_VERSION_CPP_MACROS], [

 LUSTRE_MAJOR=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\1/']`
 LUSTRE_MINOR=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\2/']`
 LUSTRE_PATCH=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\3/']`
 LUSTRE_FIX=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\5/']`
 AS_IF([test -z "$LUSTRE_FIX"], [LUSTRE_FIX="0"])
 
 LUSTRE_MAJOR=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\1/']`
 LUSTRE_MINOR=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\2/']`
 LUSTRE_PATCH=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\3/']`
 LUSTRE_FIX=`echo AC_PACKAGE_VERSION | sed -re ['s/([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?.*/\5/']`
 AS_IF([test -z "$LUSTRE_FIX"], [LUSTRE_FIX="0"])
 

-m4_pattern_allow(AC_LUSTRE)
-[AC_LUSTRE_MAJOR]=$LUSTRE_MAJOR
-[AC_LUSTRE_MINOR]=$LUSTRE_MINOR
-[AC_LUSTRE_PATCH]=$LUSTRE_PATCH
-[AC_LUSTRE_FIX]=$LUSTRE_FIX
-
-AC_SUBST([AC_LUSTRE_MAJOR])
-AC_SUBST([AC_LUSTRE_MINOR])
-AC_SUBST([AC_LUSTRE_PATCH])
-AC_SUBST([AC_LUSTRE_FIX])
+AC_DEFINE_UNQUOTED([LUSTRE_MAJOR], [$LUSTRE_MAJOR], [First number in the Lustre version])
+AC_DEFINE_UNQUOTED([LUSTRE_MINOR], [$LUSTRE_MINOR], [Second number in the Lustre version])
+AC_DEFINE_UNQUOTED([LUSTRE_PATCH], [$LUSTRE_PATCH], [Third number in the Lustre version])
+AC_DEFINE_UNQUOTED([LUSTRE_FIX], [$LUSTRE_FIX], [Fourth number in the Lustre version])
+# Even though the code could just use VERSION or PACKAGE_VERSION directly,
+# we use this copy named LUSTRE_VERSION_STRING instead to maintain less
+# divergence from the Lustre client code in the upstream Linux kernel code.
+AC_DEFINE_UNQUOTED([LUSTRE_VERSION_STRING], ["$PACKAGE_VERSION"], [A copy of PACKAGE_VERSION])

 
 ])
 
 ])