LU-1199 build: Remove obsolete ext3 check

Remove the check for journal_callback_set() which was only needed
for ext3.

Also correct a couple of comments that still mentioned "ext3".

Change-Id: I0b4362eb1171051589f3772ddc253fa249019e6b
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/4678
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Brian J. Murrell <brian.murrell@intel.com>

diff --git a/build/autoconf/lustre-build-ldiskfs.m4 b/build/autoconf/lustre-build-ldiskfs.m4
index 94e55af..db24ac5 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.
 #
@@ -252,18 +252,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])])
 ])
 
 #

diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index c31a5a0..4695daf 100644 (file)
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -92,9 +92,6 @@ extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *,
 #elif defined(HAVE_JBD2_JOURNAL_CALLBACK_SET)
 # define fsfilt_journal_callback_set(handle, func, jcb) \
          jbd2_journal_callback_set(handle, func, jcb)
-#elif defined(HAVE_JOURNAL_CALLBACK_SET)
-# define fsfilt_journal_callback_set(handle, func, jcb) \
-         journal_callback_set(handle, func, jcb)
 #else
 # error missing journal commit callback
 #endif /* HAVE_EXT4_JOURNAL_CALLBACK_ADD */