2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Mike Snitzer <[email protected]> commit 09c9d4c9b6a2b5909ae3c6265e4cd3820b636863 upstream. Revert commit 224cb3e981f1b2f9f93dbd49eaef505d17d894c2 dm: Call blk_abort_queue on failed paths Multipath began to use blk_abort_queue() to allow for lower latency path deactivation. This was found to cause list corruption: the cmd gets blk_abort_queued/timedout run on it and the scsi eh somehow is able to complete and run scsi_queue_insert while scsi_request_fn is still trying to process the request. https://www.redhat.com/archives/dm-devel/2010-November/msg00085.html Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]> Signed-off-by: Andi Kleen <[email protected]> Cc: Mike Anderson <[email protected]> Cc: Mike Christie <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/md/dm-mpath.c | 12 ------------ 1 file changed, 12 deletions(-) Index: linux-2.6.35.y/drivers/md/dm-mpath.c =================================================================== --- linux-2.6.35.y.orig/drivers/md/dm-mpath.c 2011-03-29 22:51:38.968726056 -0700 +++ linux-2.6.35.y/drivers/md/dm-mpath.c 2011-03-29 23:02:59.780305791 -0700 @@ -33,7 +33,6 @@ 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 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 @@ if (pgpath) { pgpath->is_active = 1; - INIT_WORK(&pgpath->deactivate_path, deactivate_path); INIT_WORK(&pgpath->activate_path, activate_path); } @@ -141,14 +138,6 @@ 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; @@ -993,7 +982,6 @@ 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); _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
