From: jak@rudolph.ccur.com (Joe Korty)
Message-Id: <200207230005.AAA24267@rudolph.ccur.com>
Subject: [PATCH] ext3 lockup fix to lock-break-rml-2.4.18-1.patch
To: rml@tech9.net (Robert Love)
Date: Mon, 22 Jul 2002 20:05:11 -0400 (EDT)
Cc: akpm@zip.com.au (Andrew Morton), linux-kernel@vger.kernel.org
Reply-To: joe.korty@ccur.com (Joe Korty)
In-Reply-To: <1027362145.932.49.camel@sinai> from "Robert Love" at Jul 22, 2002 11:22:25 AM
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1028
Lines: 32

Hi Robert,
The following patch fixes an apparent mismerge of Andrew Morton's low
latency work into the lock breaking patch.  Without this fix,
journal_commit_transaction() will loop forever, without making
forward progress, if need_resched was set on entry.

Base to which the patch was derived:

    linux.2.4.18.tar.bz2
    + sched-O1-2.4.18-pre8-K3.patch
    + preempt-kernel-rml-2.4.18-rc1-ingo-K3-1.patch
    + lock-break-rml-2.4.18-1.patch

Regards,
Joe


--- fs/jbd/commit.c.orig	Mon Jul 22 19:51:43 2002
+++ fs/jbd/commit.c	Mon Jul 22 19:52:00 2002
@@ -278,6 +278,7 @@
 			debug_lock_break(551);
 			spin_unlock(&journal_datalist_lock);
 			unlock_journal(journal);
+			unconditional_schedule();
 			lock_journal(journal);
 			spin_lock(&journal_datalist_lock);
 			continue;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/