From c95d7a2cb3564d38c858e97ab86e627e60a8b7a3 Mon Sep 17 00:00:00 2001 From: "robert.read" Date: Fri, 10 Apr 2009 19:18:37 +0000 Subject: [PATCH] Branch HEAD b=19025 i=jay Upstream patch, this time with the patch. --- lustre/kernel_patches/patches/small-fixes-about-jbd.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 lustre/kernel_patches/patches/small-fixes-about-jbd.patch diff --git a/lustre/kernel_patches/patches/small-fixes-about-jbd.patch b/lustre/kernel_patches/patches/small-fixes-about-jbd.patch new file mode 100644 index 0000000..d39a174 --- /dev/null +++ b/lustre/kernel_patches/patches/small-fixes-about-jbd.patch @@ -0,0 +1,13 @@ +diff -pur linux-2.6.18-128.orig/fs/jbd/commit.c linux-2.6.18-128/fs/jbd/commit.c +--- linux-2.6.18-128.orig/fs/jbd/commit.c 2009-04-10 16:31:40.000000000 +0800 ++++ linux-2.6.18-128/fs/jbd/commit.c 2009-04-10 16:33:14.000000000 +0800 +@@ -862,7 +862,8 @@ wait_for_iobuf: + if (err) + __journal_abort_hard(journal); + } +- err = journal_wait_on_commit_record(cbh); ++ if (!err && !is_journal_aborted(journal)) ++ err = journal_wait_on_commit_record(cbh); + + if (err) + journal_abort(journal, err); -- 1.8.3.1