From 983df04a97067b80f2282f0deca43bae09c68748 Mon Sep 17 00:00:00 2001
From: girish <girish>
Date: Mon, 4 Feb 2008 16:54:38 +0000
Subject: [PATCH] JBD2_HAS_COMPAT_FEATURE was used instead of
JBD2_HAS_INCOMPAT_FEATURE for checking _INCOMPAT_ASYNC_COMMIT. Fixed it.
b=10657
---
.../patches/jbd-journal-chksum-2.6-sles10.patch | 4 ++--
.../patches/jbd-journal-chksum-2.6.18-vanilla.patch | 4 ++--
2 files changed, 4 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 26c076f91e..561f62cc93 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
@@ -71,7 +71,7 @@ Index: linux-2.6.16.53-0.16/fs/jbd/commit.c
+ bh->b_end_io = journal_end_buffer_io_sync;
+
+ if (journal->j_flags & JFS_BARRIER &&
-+ !JFS_HAS_COMPAT_FEATURE(journal,
++ !JFS_HAS_INCOMPAT_FEATURE(journal,
+ JFS_FEATURE_INCOMPAT_ASYNC_COMMIT)) {
+
set_buffer_ordered(bh);
@@ -518,7 +518,7 @@ Index: linux-2.6.16.53-0.16/fs/jbd/recovery.c
+ if (chksum_err) {
+ info->end_transaction = next_commit_ID;
+
-+ if (!JFS_HAS_COMPAT_FEATURE(journal,
++ if (!JFS_HAS_INCOMPAT_FEATURE(journal,
+ JFS_FEATURE_INCOMPAT_ASYNC_COMMIT)){
+ printk(KERN_ERR
+ "JBD: Transaction %u "
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 507429aa59..7cb1b153f5 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
@@ -71,7 +71,7 @@ Index: linux-2.6.18.8/fs/jbd/commit.c
+ bh->b_end_io = journal_end_buffer_io_sync;
+
+ if (journal->j_flags & JFS_BARRIER &&
-+ !JFS_HAS_COMPAT_FEATURE(journal,
++ !JFS_HAS_INCOMPAT_FEATURE(journal,
+ JFS_FEATURE_INCOMPAT_ASYNC_COMMIT)) {
+
set_buffer_ordered(bh);
@@ -526,7 +526,7 @@ Index: linux-2.6.18.8/fs/jbd/recovery.c
+ if (chksum_err) {
+ info->end_transaction = next_commit_ID;
+
-+ if (!JFS_HAS_COMPAT_FEATURE(journal,
++ if (!JFS_HAS_INCOMPAT_FEATURE(journal,
+ JFS_FEATURE_INCOMPAT_ASYNC_COMMIT)){
+ printk(KERN_ERR
+ "JBD: Transaction %u "
--
GitLab