queue_work(kmpath_handlerd, &tmp->activate_path);
m->pg_init_in_progress++;
}
-@@ -1109,9 +1112,8 @@ static int pg_init_limit_reached(struct
+@@ -1120,9 +1123,8 @@ static int pg_init_limit_reached(struct
return limit_reached;
}
struct priority_group *pg = pgpath->pg;
struct multipath *m = pg->m;
unsigned long flags;
-@@ -1125,8 +1127,8 @@ static void pg_init_done(struct dm_path
+@@ -1136,8 +1138,8 @@ static void pg_init_done(struct dm_path
errors = 0;
break;
}
/*
* Fail path for now, so we do not ping pong
*/
-@@ -1139,6 +1141,10 @@ static void pg_init_done(struct dm_path
+@@ -1150,6 +1152,10 @@ static void pg_init_done(struct dm_path
*/
bypass_pg(m, pg, 1);
break;
/* TODO: For SCSI_DH_RETRY we should wait a couple seconds */
case SCSI_DH_RETRY:
case SCSI_DH_IMM_RETRY:
-@@ -1158,7 +1164,8 @@ static void pg_init_done(struct dm_path
+@@ -1169,7 +1175,8 @@ static void pg_init_done(struct dm_path
spin_lock_irqsave(&m->lock, flags);
if (errors) {
m->current_pgpath = NULL;
m->current_pg = NULL;
} else if (!m->pg_init_required) {
-@@ -1180,7 +1187,10 @@ static void activate_path(struct work_st
+@@ -1191,7 +1198,10 @@ static void activate_path(struct work_st
if (pgpath->path.dev)
ret = scsi_dh_activate(bdev_get_queue(pgpath->path.dev->bdev));