Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2017-07-15 20:16:02 -07:00

View File

@@ -975,6 +975,10 @@ static void __scst_tg_set_state(struct scst_target_group *tg,
list_for_each_entry(dg_dev, &tg->dg->dev_list, entry) {
dev = dg_dev->dev;
dev_changed = false;
if ((dev->handler->on_alua_state_change_start != NULL) && !dev_changed) {
dev->handler->on_alua_state_change_start(dev, old_state, state);
dev_changed = true;
}
list_for_each_entry(tgt_dev, &dev->dev_tgt_dev_list,
dev_tgt_dev_list_entry) {
tgt = tgt_dev->sess->tgt;
@@ -982,11 +986,6 @@ static void __scst_tg_set_state(struct scst_target_group *tg,
if (tg_tgt->tgt == tgt) {
bool gen_ua = (state != SCST_TG_STATE_TRANSITIONING);
if ((dev->handler->on_alua_state_change_start != NULL) && !dev_changed) {
dev->handler->on_alua_state_change_start(dev, old_state, state);
dev_changed = true;
}
if ((tg->dg->stpg_rel_tgt_id == tgt_dev->sess->tgt->rel_tgt_id) &&
tid_equal(tg->dg->stpg_transport_id, tgt_dev->sess->transport_id))
gen_ua = false;