LU-1812 ldiskfs: Add kernel patch series for SLES11SP2

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

diff --git a/ldiskfs/config/ldiskfs-build.m4 b/ldiskfs/config/ldiskfs-build.m4
index 680895e..fd0f6d2 100644 (file)
--- a/ldiskfs/config/ldiskfs-build.m4
+++ b/ldiskfs/config/ldiskfs-build.m4
@@ -616,8 +616,6 @@ fi
 #
 AC_DEFUN([LB_LDISKFS_DEFINE_OPTIONS],
 [
-LB_LDISKFS_JBD2_JOURNAL_CALLBACK_SET
-
 AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1,
        [enable extended attributes for ldiskfs])
 AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1,
@@ -632,20 +630,6 @@ AC_DEFINE(CONFIG_LDISKFSDEV_FS_SECURITY, 1,
        [enable fs security for ldiskfs])
 ])
 
-#
-# Check for jbd2_journal_callback_set(), which is needed for commit
-# callbacks.  When LU-433 lands jbd2_journal_callback_set() will only
-# remain for legacy reasons and AC_MSG_ERROR can be removed.
-#
-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])])
-])
-
-
 AC_DEFUN([LB_LDISKFS_SYMVERS],
 [
 AC_MSG_CHECKING([ldiskfs module symbols])
@@ -727,6 +711,11 @@ if $1; then
                        LDISKFS_SERIES="2.6-sles11.series"
                fi
                ;;
+       3.0.*)
+               if test x$SUSE_KERNEL = xyes; then
+                       LDISKFS_SERIES="3.0-sles11.series"
+               fi
+               ;;
        *)
                AC_MSG_WARN([Unknown kernel version $LINUXRELEASE])
                LDISKFS_SERIES=