b=15870

i=adilger

Backing this out as it tries to solve a problem that doesn't really exist
and causes build breakage in doing so.

I have advised the customer that opened this bug as to how they can fix
thier OFED source pool to match the interface provided by the
kernel-ib-devel RPM, which is our reference implementation.

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 9dc4831..e47efd8 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -130,20 +130,6 @@ LB_LINUX_TRY_COMPILE([
 
 ])
 
 
 ])
 

-# LC_SYMVERFILE
-# SLES 9 uses a different name for this file - unsure about vanilla kernels
-# around this version, but it matters for servers only.
-AC_DEFUN([LB_SYMVERFILE],
-         [AC_MSG_CHECKING([name of symverfile])
-          if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost ; then
-              SYMVERFILE=Modules.symvers
-          else
-              SYMVERFILE=Module.symvers
-          fi
-         AC_MSG_RESULT($SYMVERFILE)
-          AC_SUBST(SYMVERFILE)
-])
-

 #
 #
 # LB_LINUX_PATH
 #
 #
 # LB_LINUX_PATH


@@ -460,7 +446,6 @@ fi
 AC_DEFUN([LB_PROG_LINUX],
 [LB_LINUX_PATH
 LB_LINUX_ARCH
 AC_DEFUN([LB_PROG_LINUX],
 [LB_LINUX_PATH
 LB_LINUX_ARCH

-LB_SYMVERFILE

 
 if test $LINUX_ARCH == "powerpc64"; then
        CFLAGS="$CFLAGS -m64"
 
 if test $LINUX_ARCH == "powerpc64"; then
        CFLAGS="$CFLAGS -m64"


@@ -514,7 +499,7 @@ AC_DEFUN([LB_LINUX_CONDITIONALS],
 # or check 
 AC_DEFUN([LB_CHECK_SYMBOL_EXPORT],
 [AC_MSG_CHECKING([if Linux was built with symbol $1 is exported])
 # or check 
 AC_DEFUN([LB_CHECK_SYMBOL_EXPORT],
 [AC_MSG_CHECKING([if Linux was built with symbol $1 is exported])

-grep -q -E '[[[:space:]]]$1[[[:space:]]]' $LINUX/$SYMVERFILE 2>/dev/null
+grep -q -E '[[[:space:]]]$1[[[:space:]]]' $LINUX/Module.symvers 2>/dev/null

 rc=$?
 if test $rc -ne 0; then
     export=0
 rc=$?
 if test $rc -ne 0; then
     export=0

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 2a4eb2f..2166980 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -579,11 +579,11 @@ else
 
                # we know at this point that the found OFED source is good
                if test \( $ENABLEO2IB = 3 \); then
 
                # we know at this point that the found OFED source is good
                if test \( $ENABLEO2IB = 3 \); then

-                       if test \( -f $O2IBPATH/$SYMVERFILE \); then
-                               AC_MSG_NOTICE([adding $O2IBPATH/$SYMVERFILE to $PWD/$SYMVERFILE])
-                               cat $O2IBPATH/$SYMVERFILE >> $PWD/$SYMVERFILE
+                       if test \( -f $O2IBPATH/Module.symvers \); then
+                               AC_MSG_NOTICE([adding $O2IBPATH/Module.symvers to $PWD/Module.symvers])
+                               cat $O2IBPATH/Module.symvers >> $PWD/Module.symvers

                        else
                        else

-                               AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/$SYMVERFILE there])
+                               AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])

                        fi
                fi
 
                        fi
                fi
 

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 0c49a0f..a7aa446 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -877,6 +877,19 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
 ])
 ])
 

+# LC_SYMVERFILE
+# SLES 9 uses a different name for this file - unsure about vanilla kernels
+# around this version, but it matters for servers only.
+AC_DEFUN([LC_SYMVERFILE],
+         [AC_MSG_CHECKING([name of symverfile])
+          if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost ; then
+              SYMVERFILE=Modules.symvers
+          else
+              SYMVERFILE=Module.symvers
+          fi
+         AC_MSG_RESULT($SYMVERFILE)
+          AC_SUBST(SYMVERFILE)])
+

 # LC_DQUOTOFF_MUTEX
 # after 2.6.17 dquote use mutex instead if semaphore
 AC_DEFUN([LC_DQUOTOFF_MUTEX],
 # LC_DQUOTOFF_MUTEX
 # after 2.6.17 dquote use mutex instead if semaphore
 AC_DEFUN([LC_DQUOTOFF_MUTEX],


@@ -1523,6 +1536,9 @@ AC_DEFUN([LC_PROG_LINUX],
          # 2.6.15
          LC_INODE_I_MUTEX
 
          # 2.6.15
          LC_INODE_I_MUTEX
 

+          # SLES 10 (at least)
+          LC_SYMVERFILE
+

          # 2.6.17
          LC_DQUOTOFF_MUTEX
 
          # 2.6.17
          LC_DQUOTOFF_MUTEX