From 772292da10ac916116d621e2a6e549b0d4792a82 Mon Sep 17 00:00:00 2001 From: girish Date: Wed, 30 Sep 2009 08:14:07 +0000 Subject: [PATCH] b=18571 i=adilger i=girish o=vitaly remove wrong get_bh() from journal checksum patch --- lustre/kernel_patches/patches/jbd-journal-chksum-2.6-sles10.patch | 3 +-- lustre/kernel_patches/patches/jbd-journal-chksum-2.6.18-vanilla.patch | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lustre/kernel_patches/patches/jbd-journal-chksum-2.6-sles10.patch b/lustre/kernel_patches/patches/jbd-journal-chksum-2.6-sles10.patch index 1a6f326..fd11b39 100644 --- a/lustre/kernel_patches/patches/jbd-journal-chksum-2.6-sles10.patch +++ b/lustre/kernel_patches/patches/jbd-journal-chksum-2.6-sles10.patch @@ -38,7 +38,7 @@ Index: linux-2.6.16.53-0.16/fs/jbd/commit.c int barrier_done = 0; if (is_journal_aborted(journal)) -@@ -118,21 +123,35 @@ static int journal_write_commit_record(j +@@ -118,21 +123,34 @@ static int journal_write_commit_record(j bh = jh2bh(descriptor); @@ -63,7 +63,6 @@ Index: linux-2.6.16.53-0.16/fs/jbd/commit.c - JBUFFER_TRACE(descriptor, "write commit block"); + JBUFFER_TRACE(descriptor, "submit commit block"); + lock_buffer(bh); -+ get_bh(bh); + set_buffer_dirty(bh); - if (journal->j_flags & JFS_BARRIER) { 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 a132395..2e6865c 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 @@ -38,7 +38,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c int barrier_done = 0; if (is_journal_aborted(journal)) -@@ -119,21 +124,35 @@ +@@ -119,21 +124,34 @@ bh = jh2bh(descriptor); @@ -63,7 +63,6 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c - JBUFFER_TRACE(descriptor, "write commit block"); + JBUFFER_TRACE(descriptor, "submit commit block"); + lock_buffer(bh); -+ get_bh(bh); + set_buffer_dirty(bh); - if (journal->j_flags & JFS_BARRIER) { -- 1.8.3.1