Branch HEAD

b=18571
i=girish
i=adilger

do not take an extra reference on journal bh which prevents it to be released.

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 3669a97..2312d7a 100644 (file)
--- 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 2dca1c1..3c20f0c 100644 (file)
--- 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.8/fs/jbd/commit.c
        int barrier_done = 0;
  
        if (is_journal_aborted(journal))
-@@ -119,21 +124,35 @@ static int journal_write_commit_record(j
+@@ -119,21 +124,34 @@ static int journal_write_commit_record(j
  
        bh = jh2bh(descriptor);
  
@@ -63,7 +63,6 @@ Index: linux-2.6.18.8/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) {