Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 224cb3e9 authored by Mike Anderson's avatar Mike Anderson Committed by Jens Axboe
Browse files

dm: Call blk_abort_queue on failed paths 



Signed-off-by: default avatarMike Anderson <andmike@linux.vnet.ibm.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 11914a53

drivers/md/dm-mpath.c

+14 −1
Original line number Diff line number Diff line
@@ -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 *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);





/*-----------------------------------------------
@@ -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 *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;
@@ -870,6 +882,7 @@ static int fail_path(struct pgpath *pgpath) 
		      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);