LU-1199 build: Assume that ldiskfs PDO is now standard

[fs/lustre-release.git] / build / autoconf / lustre-build-ldiskfs.m4

diff --git a/build/autoconf/lustre-build-ldiskfs.m4 b/build/autoconf/lustre-build-ldiskfs.m4
index 94e55af..59c281f 100644 (file)
--- a/build/autoconf/lustre-build-ldiskfs.m4
+++ b/build/autoconf/lustre-build-ldiskfs.m4
@@ -138,7 +138,7 @@ fi
 #
 # LB_LDISKFS_EXT_DIR
 #
-# Determine the location of the ext3/ext4 source code.  It it required
+# Determine the location of the ext4 source code.  It it required
 # for several configure tests and to build ldiskfs.
 #
 AC_DEFUN([LB_LDISKFS_EXT_DIR],
@@ -166,7 +166,7 @@ AC_SUBST(EXT_DIR)
 #
 # LB_LDISKFS_EXT_SOURCE
 #
-# Spot check the existance of several source files common to ext3/ext4.
+# Spot check the existance of several source files common to ext4.
 # Detecting this at configure time allows us to avoid a potential build
 # failure and provide a useful error message to explain what is wrong.
 #
@@ -218,19 +218,6 @@ AC_DEFUN([LB_LDISKFS_DEFINE_OPTIONS],
 [
 AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd)
 
-with_ldiskfs_pdo=no
-case $LINUXRELEASE in
-2.6.32*)
-       if test x$RHEL_KERNEL = xyes; then
-               with_ldiskfs_pdo=yes
-               AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
-       fi
-       if test x$SUSE_KERNEL = xyes; then
-               with_ldiskfs_pdo=yes
-               AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
-       fi
-       ;;
-esac
 LB_LDISKFS_JBD2_JOURNAL_CALLBACK_SET
 
 AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1,
@@ -252,18 +239,12 @@ AC_DEFINE(CONFIG_LDISKFSDEV_FS_SECURITY, 1,
 # callbacks.  When LU-433 lands jbd2_journal_callback_set() will only
 # remain for legacy reasons and AC_MSG_ERROR can be removed.
 #
-# 2.6.18 with ext3 still uses journal_callback_set() for commit callbacks.
-#
 AC_DEFUN([LB_LDISKFS_JBD2_JOURNAL_CALLBACK_SET],
 [
        LB_CHECK_SYMBOL_EXPORT([jbd2_journal_callback_set],
-       [fs/jbd2/journal.c],
-       [AC_DEFINE(HAVE_JBD2_JOURNAL_CALLBACK_SET, 1,
-               [kernel exports jbd2_journal_callback_set])],
-       [LB_CHECK_SYMBOL_EXPORT([journal_callback_set],
-               [fs/jbd/journal.c],
-               [AC_DEFINE(HAVE_JOURNAL_CALLBACK_SET, 1,
-                       [kernel exports journal_callback_set])])])
+               [fs/jbd2/journal.c],
+               [AC_DEFINE(HAVE_JBD2_JOURNAL_CALLBACK_SET, 1,
+                       [kernel exports jbd2_journal_callback_set])])
 ])
 
 #
@@ -425,33 +406,3 @@ AC_SUBST([DUMPE2FS], [$DUMPE2FS])
 AC_SUBST([E2FSCK], [$E2FSCK])
 AC_SUBST([PFSCK], [$PFSCK])
 ])
-
-AC_DEFUN([LB_LDISKFS_SERIES],
-[
-if $1; then
-       AC_MSG_CHECKING([which ldiskfs series to use])
-       case $LINUXRELEASE in
-       2.6.18*)
-               if test x$RHEL_KERNEL = xyes; then
-                       LDISKFS_SERIES="2.6-rhel5-ext4.series"
-               fi
-               ;;
-       2.6.32*)
-               if test x$RHEL_KERNEL = xyes; then
-                       LDISKFS_SERIES="2.6-rhel6.series"
-               fi
-               if test x$SUSE_KERNEL = xyes; then
-                       LDISKFS_SERIES="2.6-sles11.series"
-               fi
-               ;;
-       *)
-               AC_MSG_WARN([Unknown kernel version $LINUXRELEASE])
-               LDISKFS_SERIES=
-               ;;
-       esac
-       AC_MSG_RESULT([$LDISKFS_SERIES])
-else
-       LDISKFS_SERIES=
-fi
-AC_SUBST(LDISKFS_SERIES)
-])