removed a patch and updated a comment

diff --git a/queue-2.6.20/jfs_fix_deadlock.patch b/queue-2.6.20/jfs_fix_deadlock.patch
deleted file mode 100644 (file)
index adcb933..0000000
--- a/queue-2.6.20/jfs_fix_deadlock.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
-Date: Wed Jan 17 21:18:35 2007 -0600
-Subject: JFS: call io_schedule() instead of schedule() to avoid deadlock
-
-From: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
-
-JFS: call io_schedule() instead of schedule() to avoid deadlock
-
-The introduction of Jens Axboe's explicit i/o plugging patches introduced a
-deadlock in jfs.  This was caused by the process initiating I/O not
-unplugging the queue before waiting on the commit thread.  The commit
-thread itself was waiting for that I/O to complete.  Calling io_schedule()
-rather than schedule() unplugs the I/O queue avoiding the deadlock, and it
-appears to be the right function to call in any case.
-
-Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- fs/jfs/jfs_lock.h     |    2 +-
- fs/jfs/jfs_metapage.c |    2 +-
- fs/jfs/jfs_txnmgr.c   |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- linux-2.6.20.1.orig/fs/jfs/jfs_lock.h
-+++ linux-2.6.20.1/fs/jfs/jfs_lock.h
-@@ -42,7 +42,7 @@ do {                                                 \
-               if (cond)                               \
-                       break;                          \
-               unlock_cmd;                             \
--              schedule();                             \
-+              io_schedule();                          \
-               lock_cmd;                               \
-       }                                               \
-       current->state = TASK_RUNNING;                  \
---- linux-2.6.20.1.orig/fs/jfs/jfs_metapage.c
-+++ linux-2.6.20.1/fs/jfs/jfs_metapage.c
-@@ -56,7 +56,7 @@ static inline void __lock_metapage(struc
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               if (metapage_locked(mp)) {
-                       unlock_page(mp->page);
--                      schedule();
-+                      io_schedule();
-                       lock_page(mp->page);
-               }
-       } while (trylock_metapage(mp));
---- linux-2.6.20.1.orig/fs/jfs/jfs_txnmgr.c
-+++ linux-2.6.20.1/fs/jfs/jfs_txnmgr.c
-@@ -135,7 +135,7 @@ static inline void TXN_SLEEP_DROP_LOCK(w
-       add_wait_queue(event, &wait);
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       TXN_UNLOCK();
--      schedule();
-+      io_schedule();
-       current->state = TASK_RUNNING;
-       remove_wait_queue(event, &wait);
- }

diff --git a/queue-2.6.20/missing-critical-phys_to_virt-in-lib-swiotlb.c.patch b/queue-2.6.20/missing-critical-phys_to_virt-in-lib-swiotlb.c.patch
index dbe6893590de8b5fa04188d8e8b97273ce6e6b23..6a2277688d00783a54b470084525649b054c6565 100644 (file)
--- a/queue-2.6.20/missing-critical-phys_to_virt-in-lib-swiotlb.c.patch
+++ b/queue-2.6.20/missing-critical-phys_to_virt-in-lib-swiotlb.c.patch
@@ -1,30 +1,23 @@
 From stable-bounces@linux.kernel.org Sun Feb  4 12:37:49 2007
-From: Stefan Richter <stefanr@s5r6.in-berlin.de>
-Date: Sun, 04 Feb 2007 21:36:15 +0100
+From: David Moore <dcm@acm.org>
+Date: Sun, 04 Feb 2007 13:39:40 -0500
 Subject: Missing critical phys_to_virt in lib/swiotlb.c
 To: stable@kernel.org
 Cc: discuss@x86-64.org, Jan Beulich <jbeulich@novell.com>, David Moore <dcm@MIT.EDU>, akpm@linux-foundation.org, linux1394-devel <linux1394-devel@lists.sourceforge.net>
 Message-ID: <45C643BF.80204@s5r6.in-berlin.de>
 
-From: Stefan Richter <stefanr@s5r6.in-berlin.de>
+From: David Moore <dcm@acm.org>
 
-David Moore wrote:
-[...]
-> considering the severity of this one-liner bug, I would like to
-> request that this simplified patch make it into 2.6.20, despite how
-> close we are to the final cut.
+Missing critical phys_to_virt in lib/swiotlb.c
 
-So we were too close. Maybe the -stable team likes to have it in 2.6.20.1.
+Adds missing call to phys_to_virt() in the
+lib/swiotlb.c:swiotlb_sync_sg() function.  Without this change, a kernel
+panic will always occur whenever a SWIOTLB bounce buffer from a
+scatter-gather list gets synced.  Affected are especially Intel x86_64
+machines with more than about 3 GB RAM.
 
-> It fixes real crashes:
-> http://lists.opensuse.org/opensuse-bugs/2006-12/msg02943.html
-> http://qa.mandriva.com/show_bug.cgi?id=28224
-> http://www.pchdtv.com/forum/viewtopic.php?t=2063&sid=a959a14a4c2db0eebaab7b0df56103ce
-
-and FireWire crashes too.
-
-
-From: Stefan Richter <stefanr@s5r6.in-berlin.de>
+Signed-off-by: David Moore <dcm@acm.org>
+Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---

diff --git a/queue-2.6.20/series b/queue-2.6.20/series
index 647c5542a4dbba5faad243ffab3d22576053aba2..d2cc7ddc4bd3638c6ef321dbc8591076007b26b2 100644 (file)
--- a/queue-2.6.20/series
+++ b/queue-2.6.20/series
@@ -70,7 +70,6 @@ don-t-add-anycast-reference-to-device-multiple-times.patch
 fix-anycast-procfs-device-leak.patch
 nfnetlink_log_refcounting_fix.patch.patch
 md_md5_6_bio_too_big_fix_fix.patch
-jfs_fix_deadlock.patch
 forcedeth-disable-msix.patch
 tty_io-fix-race-in-master-pty-close-slave-pty-close-path.patch
 sched-fix-smt-scheduler-bug.patch