u32 datalen = 0;
resp_cqe = (struct bnx2i_cmd_response *)cqe;
- spin_lock_bh(&session->back_lock);
+ spin_lock_bh(&session->lock);
task = iscsi_itt_to_task(conn,
resp_cqe->itt & ISCSI_CMD_RESPONSE_INDEX);
if (!task)
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)hdr,
conn->data, datalen);
fail:
- spin_unlock_bh(&session->back_lock);
+ spin_unlock_bh(&session->lock);
return 0;
}
int pad_len;
login = (struct bnx2i_login_response *) cqe;
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
task = iscsi_itt_to_task(conn,
login->itt & ISCSI_LOGIN_RESPONSE_INDEX);
if (!task)
bnx2i_conn->gen_pdu.resp_buf,
bnx2i_conn->gen_pdu.resp_wr_ptr - bnx2i_conn->gen_pdu.resp_buf);
done:
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
return 0;
}
int pad_len;
text = (struct bnx2i_text_response *) cqe;
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
task = iscsi_itt_to_task(conn, text->itt & ISCSI_LOGIN_RESPONSE_INDEX);
if (!task)
goto done;
bnx2i_conn->gen_pdu.resp_wr_ptr -
bnx2i_conn->gen_pdu.resp_buf);
done:
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
return 0;
}
struct iscsi_tm_rsp *resp_hdr;
tmf_cqe = (struct bnx2i_tmf_response *)cqe;
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
task = iscsi_itt_to_task(conn,
tmf_cqe->itt & ISCSI_TMF_RESPONSE_INDEX);
if (!task)
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)resp_hdr, NULL, 0);
done:
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
return 0;
}
struct iscsi_logout_rsp *resp_hdr;
logout = (struct bnx2i_logout_response *) cqe;
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
task = iscsi_itt_to_task(conn,
logout->itt & ISCSI_LOGOUT_RESPONSE_INDEX);
if (!task)
bnx2i_conn->ep->state = EP_STATE_LOGOUT_RESP_RCVD;
done:
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
return 0;
}
struct iscsi_task *task;
nop_in = (struct bnx2i_nop_in_msg *)cqe;
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
task = iscsi_itt_to_task(conn,
nop_in->itt & ISCSI_NOP_IN_MSG_INDEX);
if (task)
__iscsi_put_task(task);
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
}
/**
nop_in = (struct bnx2i_nop_in_msg *)cqe;
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
hdr = (struct iscsi_nopin *)&bnx2i_conn->gen_pdu.resp_hdr;
memset(hdr, 0, sizeof(struct iscsi_hdr));
hdr->opcode = nop_in->op_code;
}
done:
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)hdr, NULL, 0);
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
return tgt_async_nop;
}
return;
}
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
resp_hdr = (struct iscsi_async *) &bnx2i_conn->gen_pdu.resp_hdr;
memset(resp_hdr, 0, sizeof(struct iscsi_hdr));
resp_hdr->opcode = async_cqe->op_code;
__iscsi_complete_pdu(bnx2i_conn->cls_conn->dd_data,
(struct iscsi_hdr *)resp_hdr, NULL, 0);
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
}
} else
bnx2i_unsol_pdu_adjust_rq(bnx2i_conn);
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
hdr = (struct iscsi_reject *) &bnx2i_conn->gen_pdu.resp_hdr;
memset(hdr, 0, sizeof(struct iscsi_hdr));
hdr->opcode = reject->op_code;
hdr->ffffffff = cpu_to_be32(RESERVED_ITT);
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)hdr, conn->data,
reject->data_length);
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
}
/**
struct iscsi_task *task;
cmd_clean_rsp = (struct bnx2i_cleanup_response *)cqe;
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
task = iscsi_itt_to_task(conn,
cmd_clean_rsp->itt & ISCSI_CLEANUP_RESPONSE_INDEX);
if (!task)
printk(KERN_ALERT "bnx2i: cmd clean ITT %x not active\n",
cmd_clean_rsp->itt & ISCSI_CLEANUP_RESPONSE_INDEX);
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
complete(&bnx2i_conn->cmd_cleanup_cmpl);
}
int rc = 0;
int cpu;
- spin_lock(&session->back_lock);
+ spin_lock(&session->lock);
task = iscsi_itt_to_task(bnx2i_conn->cls_conn->dd_data,
cqe->itt & ISCSI_CMD_RESPONSE_INDEX);
if (!task || !task->sc) {
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
return -EINVAL;
}
sc = task->sc;
else
cpu = sc->request->cpu;
- spin_unlock(&session->back_lock);
+ spin_unlock(&session->lock);
p = &per_cpu(bnx2i_percpu, cpu);
spin_lock(&p->p_work_lock);
* iscsi_free_task - free a task
* @task: iscsi cmd task
*
- * Must be called with session back_lock.
+ * Must be called with session lock.
* This function returns the scsi command to scsi-ml or cleans
* up mgmt tasks then returns the task to the pool.
*/
{
struct iscsi_session *session = task->conn->session;
- /* regular RX path uses back_lock */
- spin_lock_bh(&session->back_lock);
+ spin_lock_bh(&session->lock);
__iscsi_put_task(task);
- spin_unlock_bh(&session->back_lock);
+ spin_unlock_bh(&session->lock);
}
EXPORT_SYMBOL_GPL(iscsi_put_task);
* @task: iscsi cmd task
* @state: state to complete task with
*
- * Must be called with session back_lock.
+ * Must be called with session lock.
*/
static void iscsi_complete_task(struct iscsi_task *task, int state)
{
* This is used when drivers do not need or cannot perform
* lower level pdu processing.
*
- * Called with session back_lock
+ * Called with session lock
*/
void iscsi_complete_scsi_task(struct iscsi_task *task,
uint32_t exp_cmdsn, uint32_t max_cmdsn)
/*
- * session back_lock must be held and if not called for a task that is
+ * session lock must be held and if not called for a task that is
* still pending or from the xmit thread, then xmit thread must
* be suspended.
*/
scsi_in(sc)->resid = scsi_in(sc)->length;
}
- /* regular RX path uses back_lock */
- spin_lock_bh(&conn->session->back_lock);
iscsi_complete_task(task, state);
- spin_unlock_bh(&conn->session->back_lock);
}
static int iscsi_prep_mgmt_task(struct iscsi_conn *conn,
return task;
free_task:
- /* regular RX path uses back_lock */
- spin_lock_bh(&session->back_lock);
__iscsi_put_task(task);
- spin_unlock_bh(&session->back_lock);
return NULL;
}
struct iscsi_session *session = conn->session;
int err = 0;
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
if (!__iscsi_conn_send_pdu(conn, hdr, data, data_size))
err = -EPERM;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
return err;
}
EXPORT_SYMBOL_GPL(iscsi_conn_send_pdu);
if (opcode != ISCSI_OP_NOOP_OUT)
return 0;
- if (rejected_pdu.itt == cpu_to_be32(ISCSI_RESERVED_TAG)) {
+ if (rejected_pdu.itt == cpu_to_be32(ISCSI_RESERVED_TAG))
/*
* nop-out in response to target's nop-out rejected.
* Just resend.
*/
- /* In RX path we are under back lock */
- spin_unlock(&conn->session->back_lock);
- spin_lock(&conn->session->frwd_lock);
iscsi_send_nopout(conn,
(struct iscsi_nopin*)&rejected_pdu);
- spin_unlock(&conn->session->frwd_lock);
- spin_lock(&conn->session->back_lock);
- } else {
+ else {
struct iscsi_task *task;
/*
* Our nop as ping got dropped. We know the target
* This should be used for mgmt tasks like login and nops, or if
* the LDD's itt space does not include the session age.
*
- * The session back_lock must be held.
+ * The session lock must be held.
*/
struct iscsi_task *iscsi_itt_to_task(struct iscsi_conn *conn, itt_t itt)
{
* @datalen: len of data buffer
*
* Completes pdu processing by freeing any resources allocated at
- * queuecommand or send generic. session back_lock must be held and verify
+ * queuecommand or send generic. session lock must be held and verify
* itt must have been called.
*/
int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
if (hdr->ttt == cpu_to_be32(ISCSI_RESERVED_TAG))
break;
- /* In RX path we are under back lock */
- spin_unlock(&session->back_lock);
- spin_lock(&session->frwd_lock);
iscsi_send_nopout(conn, (struct iscsi_nopin*)hdr);
- spin_unlock(&session->frwd_lock);
- spin_lock(&session->back_lock);
break;
case ISCSI_OP_REJECT:
rc = iscsi_handle_reject(conn, hdr, data, datalen);
{
int rc;
- spin_lock(&conn->session->back_lock);
+ spin_lock(&conn->session->lock);
rc = __iscsi_complete_pdu(conn, hdr, data, datalen);
- spin_unlock(&conn->session->back_lock);
+ spin_unlock(&conn->session->lock);
return rc;
}
EXPORT_SYMBOL_GPL(iscsi_complete_pdu);
*
* This should be used for cmd tasks.
*
- * The session back_lock must be held.
+ * The session lock must be held.
*/
struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *conn, itt_t itt)
{
struct iscsi_conn *conn;
struct device *dev;
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
conn = session->leadconn;
if (session->state == ISCSI_STATE_TERMINATE || !conn) {
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
return;
}
dev = get_device(&conn->cls_conn->dev);
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
if (!dev)
return;
/*
{
struct iscsi_session *session = conn->session;
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
if (session->state == ISCSI_STATE_FAILED) {
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
return;
}
if (conn->stop_stage == 0)
session->state = ISCSI_STATE_FAILED;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
return -ENODATA;
__iscsi_get_task(task);
- spin_unlock_bh(&conn->session->frwd_lock);
+ spin_unlock_bh(&conn->session->lock);
rc = conn->session->tt->xmit_task(task);
- spin_lock_bh(&conn->session->frwd_lock);
+ spin_lock_bh(&conn->session->lock);
if (!rc) {
/* done with this task */
task->last_xfer = jiffies;
conn->task = NULL;
}
- /* regular RX path uses back_lock */
- spin_lock(&conn->session->back_lock);
__iscsi_put_task(task);
- spin_unlock(&conn->session->back_lock);
return rc;
}
* @task: task to requeue
*
* LLDs that need to run a task from the session workqueue should call
- * this. The session frwd_lock must be held. This should only be called
+ * this. The session lock must be held. This should only be called
* by software drivers.
*/
void iscsi_requeue_task(struct iscsi_task *task)
struct iscsi_task *task;
int rc = 0;
- spin_lock_bh(&conn->session->frwd_lock);
+ spin_lock_bh(&conn->session->lock);
if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) {
ISCSI_DBG_SESSION(conn->session, "Tx suspended!\n");
- spin_unlock_bh(&conn->session->frwd_lock);
+ spin_unlock_bh(&conn->session->lock);
return -ENODATA;
}
struct iscsi_task, running);
list_del_init(&conn->task->running);
if (iscsi_prep_mgmt_task(conn, conn->task)) {
- /* regular RX path uses back_lock */
- spin_lock_bh(&conn->session->back_lock);
__iscsi_put_task(conn->task);
- spin_unlock_bh(&conn->session->back_lock);
conn->task = NULL;
continue;
}
if (!list_empty(&conn->mgmtqueue))
goto check_mgmt;
}
- spin_unlock_bh(&conn->session->frwd_lock);
+ spin_unlock_bh(&conn->session->lock);
return -ENODATA;
done:
- spin_unlock_bh(&conn->session->frwd_lock);
+ spin_unlock_bh(&conn->session->lock);
return rc;
}
cls_session = starget_to_session(scsi_target(sc->device));
session = cls_session->dd_data;
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
reason = iscsi_session_chkready(cls_session);
if (reason) {
}
session->queued_cmdsn++;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
return 0;
prepd_reject:
iscsi_complete_task(task, ISCSI_TASK_REQUEUE_SCSIQ);
reject:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
ISCSI_DBG_SESSION(session, "cmd 0x%x rejected (%d)\n",
sc->cmnd[0], reason);
return SCSI_MLQUEUE_TARGET_BUSY;
prepd_fault:
iscsi_complete_task(task, ISCSI_TASK_REQUEUE_SCSIQ);
fault:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
ISCSI_DBG_SESSION(session, "iscsi: cmd 0x%x is not queued (%d)\n",
sc->cmnd[0], reason);
if (!scsi_bidi_cmnd(sc))
struct iscsi_conn *conn = (struct iscsi_conn *)data;
struct iscsi_session *session = conn->session;
- spin_lock(&session->frwd_lock);
+ spin_lock(&session->lock);
if (conn->tmf_state == TMF_QUEUED) {
conn->tmf_state = TMF_TIMEDOUT;
ISCSI_DBG_EH(session, "tmf timedout\n");
/* unblock eh_abort() */
wake_up(&conn->ehwait);
}
- spin_unlock(&session->frwd_lock);
+ spin_unlock(&session->lock);
}
static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,
task = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)hdr,
NULL, 0);
if (!task) {
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_conn_printk(KERN_ERR, conn, "Could not send TMF.\n");
iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
return -EPERM;
}
conn->tmfcmd_pdus_cnt++;
add_timer(&conn->tmf_timer);
ISCSI_DBG_EH(session, "tmf set timeout\n");
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
/*
del_timer_sync(&conn->tmf_timer);
mutex_lock(&session->eh_mutex);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
/* if the session drops it will clean up the task */
if (age != session->age ||
session->state != ISCSI_STATE_LOGGED_IN)
* iscsi_suspend_queue - suspend iscsi_queuecommand
* @conn: iscsi conn to stop queueing IO on
*
- * This grabs the session frwd_lock to make sure no one is in
+ * This grabs the session lock to make sure no one is in
* xmit_task/queuecommand, and then sets suspend to prevent
* new commands from being queued. This only needs to be called
* by offload drivers that need to sync a path like ep disconnect
*/
void iscsi_suspend_queue(struct iscsi_conn *conn)
{
- spin_lock_bh(&conn->session->frwd_lock);
+ spin_lock_bh(&conn->session->lock);
set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
- spin_unlock_bh(&conn->session->frwd_lock);
+ spin_unlock_bh(&conn->session->lock);
}
EXPORT_SYMBOL_GPL(iscsi_suspend_queue);
ISCSI_DBG_EH(session, "scsi cmd %p timedout\n", sc);
- spin_lock(&session->frwd_lock);
+ spin_lock(&session->lock);
task = (struct iscsi_task *)sc->SCp.ptr;
if (!task) {
/*
done:
if (task)
task->last_timeout = jiffies;
- spin_unlock(&session->frwd_lock);
+ spin_unlock(&session->lock);
ISCSI_DBG_EH(session, "return %s\n", rc == BLK_EH_RESET_TIMER ?
"timer reset" : "nh");
return rc;
struct iscsi_session *session = conn->session;
unsigned long recv_timeout, next_timeout = 0, last_recv;
- spin_lock(&session->frwd_lock);
+ spin_lock(&session->lock);
if (session->state != ISCSI_STATE_LOGGED_IN)
goto done;
"last ping %lu, now %lu\n",
conn->ping_timeout, conn->recv_timeout,
last_recv, conn->last_ping, jiffies);
- spin_unlock(&session->frwd_lock);
+ spin_unlock(&session->lock);
iscsi_conn_failure(conn, ISCSI_ERR_NOP_TIMEDOUT);
return;
}
ISCSI_DBG_CONN(conn, "Setting next tmo %lu\n", next_timeout);
mod_timer(&conn->transport_timer, next_timeout);
done:
- spin_unlock(&session->frwd_lock);
+ spin_unlock(&session->lock);
}
static void iscsi_prep_abort_task_pdu(struct iscsi_task *task,
ISCSI_DBG_EH(session, "aborting sc %p\n", sc);
mutex_lock(&session->eh_mutex);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
/*
* if session was ISCSI_STATE_IN_RECOVERY then we may not have
* got the command.
if (!sc->SCp.ptr) {
ISCSI_DBG_EH(session, "sc never reached iscsi layer or "
"it completed.\n");
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
return SUCCESS;
}
*/
if (!session->leadconn || session->state != ISCSI_STATE_LOGGED_IN ||
sc->SCp.phase != session->age) {
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
ISCSI_DBG_EH(session, "failing abort due to dropped "
"session.\n");
switch (conn->tmf_state) {
case TMF_SUCCESS:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
/*
* stop tx side incase the target had sent a abort rsp but
* the initiator was still writing out data.
* good and have never sent us a successful tmf response
* then sent more data for the cmd.
*/
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
fail_scsi_task(task, DID_ABORT);
conn->tmf_state = TMF_INITIAL;
memset(hdr, 0, sizeof(*hdr));
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_start_tx(conn);
goto success_unlocked;
case TMF_TIMEDOUT:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
goto failed_unlocked;
case TMF_NOT_FOUND:
}
success:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
success_unlocked:
ISCSI_DBG_EH(session, "abort success [sc %p itt 0x%x]\n",
sc, task->itt);
return SUCCESS;
failed:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
failed_unlocked:
ISCSI_DBG_EH(session, "abort failed [sc %p itt 0x%x]\n", sc,
task ? task->itt : 0);
sc->device->lun);
mutex_lock(&session->eh_mutex);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
/*
* Just check if we are not logged in. We cannot check for
* the phase because the reset could come from a ioctl.
case TMF_SUCCESS:
break;
case TMF_TIMEDOUT:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
goto done;
default:
}
rc = SUCCESS;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_suspend_tx(conn);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
memset(hdr, 0, sizeof(*hdr));
fail_scsi_tasks(conn, sc->device->lun, DID_ERROR);
conn->tmf_state = TMF_INITIAL;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_start_tx(conn);
goto done;
unlock:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
done:
ISCSI_DBG_EH(session, "dev reset result = %s\n",
rc == SUCCESS ? "SUCCESS" : "FAILED");
{
struct iscsi_session *session = cls_session->dd_data;
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
if (session->state != ISCSI_STATE_LOGGED_IN) {
session->state = ISCSI_STATE_RECOVERY_FAILED;
if (session->leadconn)
wake_up(&session->leadconn->ehwait);
}
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
}
EXPORT_SYMBOL_GPL(iscsi_session_recovery_timedout);
conn = session->leadconn;
mutex_lock(&session->eh_mutex);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
if (session->state == ISCSI_STATE_TERMINATE) {
failed:
ISCSI_DBG_EH(session,
"failing session reset: Could not log back into "
"%s, %s [age %d]\n", session->targetname,
conn->persistent_address, session->age);
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
return FAILED;
}
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
/*
* we drop the lock here but the leadconn cannot be destoyed while
flush_signals(current);
mutex_lock(&session->eh_mutex);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
if (session->state == ISCSI_STATE_LOGGED_IN) {
ISCSI_DBG_EH(session,
"session reset succeeded for %s,%s\n",
session->targetname, conn->persistent_address);
} else
goto failed;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
return SUCCESS;
}
session->targetname);
mutex_lock(&session->eh_mutex);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
/*
* Just check if we are not logged in. We cannot check for
* the phase because the reset could come from a ioctl.
case TMF_SUCCESS:
break;
case TMF_TIMEDOUT:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
goto done;
default:
}
rc = SUCCESS;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_suspend_tx(conn);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
memset(hdr, 0, sizeof(*hdr));
fail_scsi_tasks(conn, -1, DID_ERROR);
conn->tmf_state = TMF_INITIAL;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_start_tx(conn);
goto done;
unlock:
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
done:
ISCSI_DBG_EH(session, "tgt %s reset result = %s\n", session->targetname,
rc == SUCCESS ? "SUCCESS" : "FAILED");
session->max_r2t = 1;
session->tt = iscsit;
session->dd_data = cls_session->dd_data + sizeof(*session);
-
mutex_init(&session->eh_mutex);
- spin_lock_init(&session->frwd_lock);
- spin_lock_init(&session->back_lock);
+ spin_lock_init(&session->lock);
/* initialize SCSI PDU commands pool */
if (iscsi_pool_init(&session->cmdpool, session->cmds_max,
INIT_WORK(&conn->xmitwork, iscsi_xmitworker);
/* allocate login_task used for the login/text sequences */
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
if (!kfifo_out(&session->cmdpool.queue,
(void*)&conn->login_task,
sizeof(void*))) {
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
goto login_task_alloc_fail;
}
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
data = (char *) __get_free_pages(GFP_KERNEL,
get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
del_timer_sync(&conn->transport_timer);
mutex_lock(&session->eh_mutex);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
conn->c_stage = ISCSI_CONN_CLEANUP_WAIT;
if (session->leadconn == conn) {
/*
session->state = ISCSI_STATE_TERMINATE;
wake_up(&conn->ehwait);
}
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
/* flush queued up work because we free the connection below */
iscsi_suspend_tx(conn);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
free_pages((unsigned long) conn->data,
get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
kfree(conn->persistent_address);
kfree(conn->local_ipaddr);
- /* regular RX path uses back_lock */
- spin_lock_bh(&session->back_lock);
kfifo_in(&session->cmdpool.queue, (void*)&conn->login_task,
sizeof(void*));
- spin_unlock_bh(&session->back_lock);
if (session->leadconn == conn)
session->leadconn = NULL;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
iscsi_destroy_conn(cls_conn);
conn->ping_timeout = 5;
}
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
conn->c_stage = ISCSI_CONN_STARTED;
session->state = ISCSI_STATE_LOGGED_IN;
session->queued_cmdsn = session->cmdsn;
default:
break;
}
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
iscsi_unblock_session(session->cls_session);
wake_up(&conn->ehwait);
int old_stop_stage;
mutex_lock(&session->eh_mutex);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
if (conn->stop_stage == STOP_CONN_TERM) {
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
return;
}
old_stop_stage = conn->stop_stage;
conn->stop_stage = flag;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
del_timer_sync(&conn->transport_timer);
iscsi_suspend_tx(conn);
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
conn->c_stage = ISCSI_CONN_STOPPED;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
/*
* for connection level recovery we should not calculate
/*
* flush queues.
*/
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
fail_scsi_tasks(conn, -1, DID_TRANSPORT_DISRUPTED);
fail_mgmt_tasks(session, conn);
memset(&conn->tmhdr, 0, sizeof(conn->tmhdr));
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
}
struct iscsi_session *session = cls_session->dd_data;
struct iscsi_conn *conn = cls_conn->dd_data;
- spin_lock_bh(&session->frwd_lock);
+ spin_lock_bh(&session->lock);
if (is_leading)
session->leadconn = conn;
- spin_unlock_bh(&session->frwd_lock);
+ spin_unlock_bh(&session->lock);
/*
* Unblock xmitworker(), Login Phase will pass through.
projects / users / jedix / linux-maple.git / commitdiff