Imported linux-2.6.27.39 suse/xen patches.

[ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / dm-abort-queue-on-failed-paths

diff --git a/src/patches/suse-2.6.27.31/patches.drivers/dm-abort-queue-on-failed-paths b/src/patches/suse-2.6.27.31/patches.drivers/dm-abort-queue-on-failed-paths
deleted file mode 100644 (file)
index 8991a34..0000000
--- a/src/patches/suse-2.6.27.31/patches.drivers/dm-abort-queue-on-failed-paths
+++ /dev/null
@@ -1,69 +0,0 @@
-Subject: dm: Call blk_abort_queue on failed paths
-From: Mike Anderson <andmike@linux.vnet.ibm.com>
-Date: Thu Oct 9 08:56:14 2008 +0200:
-Git: 224cb3e981f1b2f9f93dbd49eaef505d17d894c2
-References: bnc#434105
-
-Another small bugfix for request timeout.
-
-Signed-off-by: Mike Anderson <andmike@linux.vnet.ibm.com>
-Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-Signed-off-by: Hannes Reinecke <hare@suse.de>
-
----
- drivers/md/dm-mpath.c |   15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
---- a/drivers/md/dm-mpath.c
-+++ b/drivers/md/dm-mpath.c
-@@ -33,6 +33,7 @@ struct pgpath {
-       unsigned fail_count;            /* Cumulative failure count */
- 
-       struct dm_path path;
-+      struct work_struct deactivate_path;
- };
- 
- #define path_to_pgpath(__pgp) container_of((__pgp), struct pgpath, path)
-@@ -112,6 +113,7 @@ static struct workqueue_struct *kmultipa
- static void process_queued_ios(struct work_struct *work);
- static void trigger_event(struct work_struct *work);
- static void activate_path(struct work_struct *work);
-+static void deactivate_path(struct work_struct *work);
- 
- 
- /*-----------------------------------------------
-@@ -122,8 +124,10 @@ static struct pgpath *alloc_pgpath(void)
- {
-       struct pgpath *pgpath = kzalloc(sizeof(*pgpath), GFP_KERNEL);
- 
--      if (pgpath)
-+      if (pgpath) {
-               pgpath->path.is_active = 1;
-+              INIT_WORK(&pgpath->deactivate_path, deactivate_path);
-+      }
- 
-       return pgpath;
- }
-@@ -133,6 +137,14 @@ static void free_pgpath(struct pgpath *p
-       kfree(pgpath);
- }
- 
-+static void deactivate_path(struct work_struct *work)
-+{
-+      struct pgpath *pgpath =
-+              container_of(work, struct pgpath, deactivate_path);
-+
-+      blk_abort_queue(pgpath->path.dev->bdev->bd_disk->queue);
-+}
-+
- static struct priority_group *alloc_priority_group(void)
- {
-       struct priority_group *pg;
-@@ -881,6 +893,7 @@ static int fail_path(struct pgpath *pgpa
-                     pgpath->path.dev->name, m->nr_valid_paths);
- 
-       queue_work(kmultipathd, &m->trigger_event);
-+      queue_work(kmultipathd, &pgpath->deactivate_path);
- 
- out:
-       spin_unlock_irqrestore(&m->lock, flags);