LU-1914 ldlm: add doxygen comments

[fs/lustre-release.git] / lustre / kernel_patches / patches / jbd2-jcberr-2.6-rhel5.patch

diff --git a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch
index 5c15956..4a57ec3 100644 (file)
--- a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch
+++ b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch
@@ -1,3 +1,8 @@
+This patch is no longer needed for Lustre, since Lustre 2.2.  It is kept
+in the kernel patch series for compatibility with older Lustre releases
+to simplify the upgrade process so that both the kernel and Lustre do
+not need to be upgraded at the same time.  See Jira issue LU-433.
+
 Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
 ===================================================================
 --- linux-2.6.18-128.1.6.orig/include/linux/jbd2.h     2009-04-15 08:35:28.000000000 +0530
@@ -137,13 +142,12 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/journal.c
 ===================================================================
 --- linux-2.6.18-128.1.6.orig/fs/jbd2/journal.c        2009-04-15 08:35:28.000000000 +0530
 +++ linux-2.6.18-128.1.6/fs/jbd2/journal.c     2009-05-28 17:13:35.000000000 +0530
-@@ -80,6 +80,9 @@
+@@ -80,6 +80,8 @@
  EXPORT_SYMBOL(jbd2_journal_init_jbd_inode);
  EXPORT_SYMBOL(jbd2_journal_release_jbd_inode);
  EXPORT_SYMBOL(jbd2_journal_begin_ordered_truncate);
 +EXPORT_SYMBOL(jbd2_journal_callback_set);
 +EXPORT_SYMBOL(jbd2_journal_bmap);
-+EXPORT_SYMBOL(jbd2_log_start_commit);
  
  static int journal_convert_superblock_v1(journal_t *, journal_superblock_t *);
  static void __journal_abort_soft (journal_t *journal, int errno);