Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 148062
b: refs/heads/master
c: 4421c9e
h: refs/heads/master
v: v3
  • Loading branch information
Mike Christie authored and James Bottomley committed May 23, 2009
1 parent 7fd8d45 commit c680776
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3cd5050bf8eb32ceecee129cac7c59e6f1668c4
refs/heads/master: 4421c9ebeeacf3d9c4e6aa558e1a777178e71add
11 changes: 10 additions & 1 deletion trunk/drivers/scsi/libiscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,12 @@ static void iscsi_free_task(struct iscsi_task *task)
struct iscsi_session *session = conn->session;
struct scsi_cmnd *sc = task->sc;

ISCSI_DBG_SESSION(session, "freeing task itt 0x%x state %d sc %p\n",
task->itt, task->state, task->sc);

session->tt->cleanup_task(task);
task->state = ISCSI_TASK_FREE;
task->sc = NULL;

/*
* login task is preallocated so do not free
*/
Expand Down Expand Up @@ -451,6 +453,9 @@ static void iscsi_complete_task(struct iscsi_task *task, int state)
{
struct iscsi_conn *conn = task->conn;

ISCSI_DBG_SESSION(conn->session,
"complete task itt 0x%x state %d sc %p\n",
task->itt, task->state, task->sc);
if (task->state == ISCSI_TASK_COMPLETED ||
task->state == ISCSI_TASK_ABRT_TMF ||
task->state == ISCSI_TASK_ABRT_SESS_RECOV)
Expand Down Expand Up @@ -1836,6 +1841,8 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
cls_session = starget_to_session(scsi_target(sc->device));
session = cls_session->dd_data;

ISCSI_DBG_SESSION(session, "aborting sc %p\n", sc);

mutex_lock(&session->eh_mutex);
spin_lock_bh(&session->lock);
/*
Expand All @@ -1858,6 +1865,8 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
sc->SCp.phase != session->age) {
spin_unlock_bh(&session->lock);
mutex_unlock(&session->eh_mutex);
ISCSI_DBG_SESSION(session, "failing abort due to dropped "
"session.\n");
return FAILED;
}

Expand Down

0 comments on commit c680776

Please sign in to comment.