--- drivers/scsi/libiscsi.c

+++ drivers/scsi/libiscsi.c

@@ -384,12 +384,12 @@ static int iscsi_prep_scsi_cmd_pdu(struc

WARN_ON(hdrlength >= 256);

hdr->hlength = hdrlength & 0xFF;

+ hdr->cmdsn = task->cmdsn = cpu_to_be32(session->cmdsn);

if (session->tt->init_task && session->tt->init_task(task))

return -EIO;

task->state = ISCSI_TASK_RUNNING;

- hdr->cmdsn = task->cmdsn = cpu_to_be32(session->cmdsn);

session->cmdsn++;

conn->scsicmd_pdus_cnt++;

@@ -2823,14 +2823,15 @@ static void iscsi_start_session_recovery

session->state = ISCSI_STATE_TERMINATE;

else if (conn->stop_stage != STOP_CONN_RECOVER)

session->state = ISCSI_STATE_IN_RECOVERY;

+

+ old_stop_stage = conn->stop_stage;

+ conn->stop_stage = flag;

spin_unlock_bh(&session->lock);

del_timer_sync(&conn->transport_timer);

iscsi_suspend_tx(conn);

spin_lock_bh(&session->lock);

- old_stop_stage = conn->stop_stage;

- conn->stop_stage = flag;

conn->c_stage = ISCSI_CONN_STOPPED;

spin_unlock_bh(&session->lock);