X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fjbd2-jcberr-2.6-rhel5.patch;h=5c1595620853966db5308ec0167c0d4caab2bdcb;hb=864c1cef52710ce1980f32592bd1af364c6a75ed;hp=476e06f41d9d9ef9c518de9ba033505f1fb5d948;hpb=9dce07db5dc5ff3e0ffa57289ac095966a88adcc;p=fs%2Flustre-release.git

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 476e06f..5c15956 100644
--- a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch
+++ b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch
@@ -74,9 +74,9 @@ Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
 +	 * Called when the transaction is committed. [t_jcb_lock]
 +	 */
 +	struct list_head	t_jcb;
- };
- 
- struct transaction_run_stats_s {
+	/*
+	 * For use by the filesystem to store fs-specific data
+	 * structures associated with the transaction
 @@ -1018,6 +1058,9 @@
  extern int	 jbd2_journal_flush (journal_t *);
  extern void	 jbd2_journal_lock_updates (journal_t *);
@@ -101,12 +101,12 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/checkpoint.c
  
 Index: linux-2.6.18-128.1.6/fs/jbd2/commit.c
 ===================================================================
---- linux-2.6.18-128.1.6.orig/fs/jbd2/commit.c	2009-04-15 08:35:28.000000000 +0530
-+++ linux-2.6.18-128.1.6/fs/jbd2/commit.c	2009-05-28 15:12:45.000000000 +0530
-@@ -898,6 +898,30 @@
+--- linux-2.6.18-164.6.1/fs/jbd2/commit.c	2010-01-21 11:24:52.000000000 +0530
++++ linux-2.6.18-164.6.1_new/fs/jbd2/commit.c	2010-01-21 11:26:36.000000000 +0530
+@@ -832,6 +832,29 @@ wait_for_iobuf:
+            processing: any buffers committed as a result of this
             transaction can be removed from any checkpoint list it was on
             before. */
- 
 +	/*
 +	 * Call any callbacks that had been registered for handles in this
 +	 * transaction.  It is up to the callback to free any allocated
@@ -130,18 +130,17 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/commit.c
 +		}
 +	}
 +	spin_unlock(&commit_transaction->t_jcb_lock);
-+
- 	jbd_debug(3, "JBD: commit phase 7\n");
  
- 	J_ASSERT(commit_transaction->t_sync_datalist == NULL);
+ 	jbd_debug(3, "JBD: commit phase 6\n");
+ 
 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 @@
- EXPORT_SYMBOL(jbd2_journal_invalidatepage);
- EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers);
- EXPORT_SYMBOL(jbd2_journal_force_commit);
+ 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);
@@ -153,9 +152,9 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/transaction.c
 --- linux-2.6.18-128.1.6.orig/fs/jbd2/transaction.c	2009-04-15 08:35:28.000000000 +0530
 +++ linux-2.6.18-128.1.6/fs/jbd2/transaction.c	2009-05-28 15:11:28.000000000 +0530
 @@ -51,6 +51,9 @@
- 	transaction->t_tid = journal->j_transaction_sequence++;
- 	transaction->t_expires = jiffies + journal->j_commit_interval;
  	spin_lock_init(&transaction->t_handle_lock);
+	INIT_LIST_HEAD(&transaction->t_inode_list);
+	INIT_LIST_HEAD(&transaction->t_private_list);
 +	INIT_LIST_HEAD(&transaction->t_jcb);
 +	spin_lock_init(&transaction->t_jcb_lock);
 +