X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fjbd-journal-chksum-2.6.18-vanilla.patch;h=2dca1c13b9599517372f8b04f1e8ca429d4ada34;hb=88d9b7ea9da2d21d517c437aaaad48b1d015c80a;hp=c2240611c41e35df86814f07d44c078aa214f28f;hpb=66a84c20b4e67a6c06a300e6d95201f03871c5f2;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch
index c224061..2dca1c1 100644
--- a/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch
+++ b/lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch
@@ -188,7 +188,7 @@ Index: linux-2.6.18.8/fs/jbd/commit.c
  
  	/*
  	 * First job: lock down the current transaction and wait for
-@@ -439,38 +532,14 @@ void journal_commit_transaction(journal_
+@@ -439,39 +532,14 @@ void journal_commit_transaction(journal_
  	journal_submit_data_buffers(journal, commit_transaction);
  
  	/*
@@ -206,10 +206,11 @@ Index: linux-2.6.18.8/fs/jbd/commit.c
 -		if (buffer_locked(bh)) {
 -			spin_unlock(&journal->j_list_lock);
 -			wait_on_buffer(bh);
--			if (unlikely(!buffer_uptodate(bh)))
--				err = -EIO;
 -			spin_lock(&journal->j_list_lock);
 -		}
+-		if (unlikely(!buffer_uptodate(bh)))
+-			err = -EIO;
+-
 -		if (!inverted_lock(journal, bh)) {
 -			put_bh(bh);
 -			spin_lock(&journal->j_list_lock);