|
@@ -33,7 +33,6 @@ struct pgpath {
|
|
|
unsigned fail_count; /* Cumulative failure count */
|
|
|
|
|
|
struct dm_path path;
|
|
|
- struct work_struct deactivate_path;
|
|
|
struct work_struct activate_path;
|
|
|
};
|
|
|
|
|
@@ -116,7 +115,6 @@ static struct workqueue_struct *kmultipathd, *kmpath_handlerd;
|
|
|
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);
|
|
|
|
|
|
|
|
|
/*-----------------------------------------------
|
|
@@ -129,7 +127,6 @@ static struct pgpath *alloc_pgpath(void)
|
|
|
|
|
|
if (pgpath) {
|
|
|
pgpath->is_active = 1;
|
|
|
- INIT_WORK(&pgpath->deactivate_path, deactivate_path);
|
|
|
INIT_WORK(&pgpath->activate_path, activate_path);
|
|
|
}
|
|
|
|
|
@@ -141,14 +138,6 @@ static void free_pgpath(struct pgpath *pgpath)
|
|
|
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;
|
|
@@ -995,7 +984,6 @@ static int fail_path(struct pgpath *pgpath)
|
|
|
pgpath->path.dev->name, m->nr_valid_paths);
|
|
|
|
|
|
schedule_work(&m->trigger_event);
|
|
|
- queue_work(kmultipathd, &pgpath->deactivate_path);
|
|
|
|
|
|
out:
|
|
|
spin_unlock_irqrestore(&m->lock, flags);
|