email fixes, and drop a dm patch

diff --git a/queue-2.6.32/dm-log-userspace-fix-overhead_size-calcuations.patch b/queue-2.6.32/dm-log-userspace-fix-overhead_size-calcuations.patch
index d2415ef57978759422187a3bc6d61700bd1dc1fd..f0881cc81eac1c2861989b301878a57ec441bfa0 100644 (file)
--- a/queue-2.6.32/dm-log-userspace-fix-overhead_size-calcuations.patch
+++ b/queue-2.6.32/dm-log-userspace-fix-overhead_size-calcuations.patch
@@ -28,7 +28,7 @@ worth of space at the end uncleared.  Thus, this bug was never producing
 a bad result, but still needs to be fixed - especially now that the
 value is computed correctly.
 
-Signed-off-by: Jonathan Brassow <jbrassow@redhat.com
+Signed-off-by: Jonathan Brassow <jbrassow@redhat.com>
 Signed-off-by: Alasdair G Kergon <agk@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 

diff --git a/queue-2.6.32/dm-mpath-fix-stall-when-requeueing-io.patch b/queue-2.6.32/dm-mpath-fix-stall-when-requeueing-io.patch
deleted file mode 100644 (file)
index 5a88809..0000000
--- a/queue-2.6.32/dm-mpath-fix-stall-when-requeueing-io.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 9eef87da2a8ea4920e0d913ff977cac064b68ee0 Mon Sep 17 00:00:00 2001
-From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
-Date: Tue, 16 Feb 2010 18:43:01 +0000
-Subject: dm mpath: fix stall when requeueing io
-
-From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
-
-commit 9eef87da2a8ea4920e0d913ff977cac064b68ee0 upstream.
-
-This patch fixes the problem that system may stall if target's ->map_rq
-returns DM_MAPIO_REQUEUE in map_request().
-E.g. stall happens on 1 CPU box when a dm-mpath device with queue_if_no_path
-     bounces between all-paths-down and paths-up on I/O load.
-
-When target's ->map_rq returns DM_MAPIO_REQUEUE, map_request() requeues
-the request and returns to dm_request_fn().  Then, dm_request_fn()
-doesn't exit the I/O dispatching loop and continues processing
-the requeued request again.
-This map and requeue loop can be done with interrupt disabled,
-so 1 CPU system can be stalled if this situation happens.
-
-For example, commands below can stall my 1 CPU box within 1 minute or so:
-  # dmsetup table mp
-  mp: 0 2097152 multipath 1 queue_if_no_path 0 1 1 service-time 0 1 2 8:144 1 1
-  # while true; do dd if=/dev/mapper/mp of=/dev/null bs=1M count=100; done &
-  # while true; do \
-  > dmsetup message mp 0 "fail_path 8:144" \
-  > dmsetup suspend --noflush mp \
-  > dmsetup resume mp \
-  > dmsetup message mp 0 "reinstate_path 8:144" \
-  > done
-
-To fix the problem above, this patch changes dm_request_fn() to exit
-the I/O dispatching loop once if a request is requeued in map_request().
-
-Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
-Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
-Signed-off-by: Alasdair G Kergon <agk@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/md/dm.c |   21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
---- a/drivers/md/dm.c
-+++ b/drivers/md/dm.c
-@@ -1487,11 +1487,15 @@ static int dm_prep_fn(struct request_que
-       return BLKPREP_OK;
- }
- 
--static void map_request(struct dm_target *ti, struct request *rq,
--                      struct mapped_device *md)
-+/*
-+ * Returns:
-+ * 0  : the request has been processed (not requeued)
-+ * !0 : the request has been requeued
-+ */
-+static int map_request(struct dm_target *ti, struct request *clone,
-+                     struct mapped_device *md)
- {
--      int r;
--      struct request *clone = rq->special;
-+      int r, requeued = 0;
-       struct dm_rq_target_io *tio = clone->end_io_data;
- 
-       /*
-@@ -1516,6 +1520,7 @@ static void map_request(struct dm_target
-       case DM_MAPIO_REQUEUE:
-               /* The target wants to requeue the I/O */
-               dm_requeue_unmapped_request(clone);
-+              requeued = 1;
-               break;
-       default:
-               if (r > 0) {
-@@ -1527,6 +1532,8 @@ static void map_request(struct dm_target
-               dm_kill_unmapped_request(clone, r);
-               break;
-       }
-+
-+      return requeued;
- }
- 
- /*
-@@ -1568,12 +1575,16 @@ static void dm_request_fn(struct request
- 
-               blk_start_request(rq);
-               spin_unlock(q->queue_lock);
--              map_request(ti, rq, md);
-+              if (map_request(ti, rq, md))
-+                      goto requeued;
-               spin_lock_irq(q->queue_lock);
-       }
- 
-       goto out;
- 
-+requeued:
-+      spin_lock_irq(q->queue_lock);
-+
- plug_and_out:
-       if (!elv_queue_empty(q))
-               /* Some requests still remain, retry later */

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index d5f752302ffe8eb641b6a641bf1334c9b6f14be6..57fc304bc51c5c9ebc73df473dc1c223fb082251 100644 (file)
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -90,4 +90,3 @@ mac80211-fix-probe-request-filtering-in-ibss-mode.patch
 iwlwifi-fix-to-set-correct-ht-configuration.patch
 dm-stripe-avoid-divide-by-zero-with-invalid-stripe-count.patch
 dm-log-userspace-fix-overhead_size-calcuations.patch
-dm-mpath-fix-stall-when-requeueing-io.patch

diff --git a/queue-2.6.32/staging-fix-rtl8187se-compilation-errors-with-mac80211.patch b/queue-2.6.32/staging-fix-rtl8187se-compilation-errors-with-mac80211.patch
index 93f403d12bbf2b43fb6e096cc2175824c3e0bf72..7e7aed19e0dffff009fddca997dba173f9fe457e 100644 (file)
--- a/queue-2.6.32/staging-fix-rtl8187se-compilation-errors-with-mac80211.patch
+++ b/queue-2.6.32/staging-fix-rtl8187se-compilation-errors-with-mac80211.patch
@@ -10,7 +10,7 @@ commit df574b8ecfb3a84af96229f336a6be88ca4a7055 upstream.
 This patch fixes compilation problems that were caused by function
 naming conflicts between the rtl8187se driver and the mac80211 stack.
 
-Signed-off-by: George Kadianakis <desnacked at gmail.com>
+Signed-off-by: George Kadianakis <desnacked@gmail.com>
 Cc: maximilian attems <max@stro.at>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>