1 files changed, 27 insertions, 37 deletions

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index c15fde808c33..da8b61543ee4 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -505,6 +505,7 @@ static void iscsi_free_task(struct iscsi_task *task)
         struct iscsi_conn *conn = task->conn;
         struct iscsi_session *session = conn->session;
         struct scsi_cmnd *sc = task->sc;
+        int oldstate = task->state;
 
         ISCSI_DBG_SESSION(session, "freeing task itt 0x%x state %d sc %p\n",
                           task->itt, task->state, task->sc);
@@ -525,10 +526,10 @@ static void iscsi_free_task(struct iscsi_task *task)
                 /* SCSI eh reuses commands to verify us */
                 sc->SCp.ptr = NULL;
                 /*
-                 * queue command may call this to free the task, but
-                 * not have setup the sc callback
+                 * queue command may call this to free the task, so
+                 * it will decide how to return sc to scsi-ml.
                  */
-                if (sc->scsi_done)
+                if (oldstate != ISCSI_TASK_REQUEUE_SCSIQ)
                         sc->scsi_done(sc);
         }
 }
@@ -539,11 +540,12 @@ void __iscsi_get_task(struct iscsi_task *task)
 }
 EXPORT_SYMBOL_GPL(__iscsi_get_task);
 
-static void __iscsi_put_task(struct iscsi_task *task)
+void __iscsi_put_task(struct iscsi_task *task)
 {
         if (atomic_dec_and_test(&task->refcount))
                 iscsi_free_task(task);
 }
+EXPORT_SYMBOL_GPL(__iscsi_put_task);
 
 void iscsi_put_task(struct iscsi_task *task)
 {
@@ -571,7 +573,8 @@ static void iscsi_complete_task(struct iscsi_task *task, int state)
                           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)
+            task->state == ISCSI_TASK_ABRT_SESS_RECOV ||
+            task->state == ISCSI_TASK_REQUEUE_SCSIQ)
                 return;
         WARN_ON_ONCE(task->state == ISCSI_TASK_FREE);
         task->state = state;
@@ -1335,17 +1338,16 @@ void iscsi_session_failure(struct iscsi_session *session,
 {
         struct iscsi_conn *conn;
         struct device *dev;
-        unsigned long flags;
 
-        spin_lock_irqsave(&session->lock, flags);
+        spin_lock_bh(&session->lock);
         conn = session->leadconn;
         if (session->state == ISCSI_STATE_TERMINATE || !conn) {
-                spin_unlock_irqrestore(&session->lock, flags);
+                spin_unlock_bh(&session->lock);
                 return;
         }
 
         dev = get_device(&conn->cls_conn->dev);
-        spin_unlock_irqrestore(&session->lock, flags);
+        spin_unlock_bh(&session->lock);
         if (!dev)
                 return;
         /*
@@ -1364,17 +1366,16 @@ EXPORT_SYMBOL_GPL(iscsi_session_failure);
 void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)
 {
         struct iscsi_session *session = conn->session;
-        unsigned long flags;
 
-        spin_lock_irqsave(&session->lock, flags);
+        spin_lock_bh(&session->lock);
         if (session->state == ISCSI_STATE_FAILED) {
-                spin_unlock_irqrestore(&session->lock, flags);
+                spin_unlock_bh(&session->lock);
                 return;
         }
 
         if (conn->stop_stage == 0)
                 session->state = ISCSI_STATE_FAILED;
-        spin_unlock_irqrestore(&session->lock, flags);
+        spin_unlock_bh(&session->lock);
 
         set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
         set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
@@ -1599,27 +1600,23 @@ enum {
         FAILURE_SESSION_NOT_READY,
 };
 
-static int iscsi_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
+int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc)
 {
         struct iscsi_cls_session *cls_session;
-        struct Scsi_Host *host;
         struct iscsi_host *ihost;
         int reason = 0;
         struct iscsi_session *session;
         struct iscsi_conn *conn;
         struct iscsi_task *task = NULL;
 
-        sc->scsi_done = done;
         sc->result = 0;
         sc->SCp.ptr = NULL;
 
-        host = sc->device->host;
         ihost = shost_priv(host);
-        spin_unlock(host->host_lock);
 
         cls_session = starget_to_session(scsi_target(sc->device));
         session = cls_session->dd_data;
-        spin_lock(&session->lock);
+        spin_lock_bh(&session->lock);
 
         reason = iscsi_session_chkready(cls_session);
         if (reason) {
@@ -1705,25 +1702,21 @@ static int iscsi_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi
         }
 
         session->queued_cmdsn++;
-        spin_unlock(&session->lock);
-        spin_lock(host->host_lock);
+        spin_unlock_bh(&session->lock);
         return 0;
 
 prepd_reject:
-        sc->scsi_done = NULL;
-        iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
+        iscsi_complete_task(task, ISCSI_TASK_REQUEUE_SCSIQ);
 reject:
-        spin_unlock(&session->lock);
+        spin_unlock_bh(&session->lock);
         ISCSI_DBG_SESSION(session, "cmd 0x%x rejected (%d)\n",
                           sc->cmnd[0], reason);
-        spin_lock(host->host_lock);
         return SCSI_MLQUEUE_TARGET_BUSY;
 
 prepd_fault:
-        sc->scsi_done = NULL;
-        iscsi_complete_task(task, ISCSI_TASK_COMPLETED);
+        iscsi_complete_task(task, ISCSI_TASK_REQUEUE_SCSIQ);
 fault:
-        spin_unlock(&session->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))
@@ -1732,12 +1725,9 @@ fault:
                 scsi_out(sc)->resid = scsi_out(sc)->length;
                 scsi_in(sc)->resid = scsi_in(sc)->length;
         }
-        done(sc);
-        spin_lock(host->host_lock);
+        sc->scsi_done(sc);
         return 0;
 }
-
-DEF_SCSI_QCMD(iscsi_queuecommand)
 EXPORT_SYMBOL_GPL(iscsi_queuecommand);
 
 int iscsi_change_queue_depth(struct scsi_device *sdev, int depth, int reason)
@@ -1795,9 +1785,9 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,
                                       NULL, 0);
         if (!task) {
                 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->lock);
-                ISCSI_DBG_EH(session, "tmf exec failure\n");
                 return -EPERM;
         }
         conn->tmfcmd_pdus_cnt++;
@@ -2202,7 +2192,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
                 goto success_unlocked;
         case TMF_TIMEDOUT:
                 spin_unlock_bh(&session->lock);
-                iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
                 goto failed_unlocked;
         case TMF_NOT_FOUND:
                 if (!sc->SCp.ptr) {
@@ -2289,7 +2279,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
                 break;
         case TMF_TIMEDOUT:
                 spin_unlock_bh(&session->lock);
-                iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
                 goto done;
         default:
                 conn->tmf_state = TMF_INITIAL;
@@ -2370,7 +2360,7 @@ failed:
          * we drop the lock here but the leadconn cannot be destoyed while
          * we are in the scsi eh
          */
-        iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+        iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
 
         ISCSI_DBG_EH(session, "wait for relogin\n");
         wait_event_interruptible(conn->ehwait,
@@ -2452,7 +2442,7 @@ int iscsi_eh_target_reset(struct scsi_cmnd *sc)
                 break;
         case TMF_TIMEDOUT:
                 spin_unlock_bh(&session->lock);
-                iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
                 goto done;
         default:
                 conn->tmf_state = TMF_INITIAL;