Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target patches from Nicholas Bellinger:
 "Here are the remaining target-pending patches for v3.9-rc1.

  The most important one here is the immediate queue starvation
  regression fix for iscsi-target, which addresses a bug that's
  effecting v3.5+ kernels under heavy sustained READ only workloads.
  Thanks alot to Benjamin Estrabaud for helping to track this down!

  Also included is a pSCSI exception bugfix from Asias, along with a
  handful of other minor changes.  Both bugfixes are CC'ed to stable."

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target/pscsi: Rename sg_num to nr_vecs in pscsi_get_bio()
  target/pscsi: Fix page increment
  target/pscsi: Drop unnecessary NULL assignment to bio->bi_next
  target: Add __exit annotation for module_exit functions
  iscsi-target: Fix immediate queue starvation regression with DATAIN

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 9435a3d369a7..7ea246a07731 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -3584,6 +3584,10 @@ check_rsp_state:
                                 spin_lock_bh(&cmd->istate_lock);
                                 cmd->i_state = ISTATE_SENT_STATUS;
                                 spin_unlock_bh(&cmd->istate_lock);
+
+                                if (atomic_read(&conn->check_immediate_queue))
+                                        return 1;
+
                                 continue;
                         } else if (ret == 2) {
                                 /* Still must send status,
@@ -3673,7 +3677,7 @@ check_rsp_state:
                 }
 
                 if (atomic_read(&conn->check_immediate_queue))
-                        break;
+                        return 1;
         }
 
         return 0;
@@ -3717,12 +3721,15 @@ restart:
                      signal_pending(current))
                         goto transport_err;
 
+get_immediate:
                 ret = handle_immediate_queue(conn);
                 if (ret < 0)
                         goto transport_err;
 
                 ret = handle_response_queue(conn);
-                if (ret == -EAGAIN)
+                if (ret == 1)
+                        goto get_immediate;
+                else if (ret == -EAGAIN)
                         goto restart;
                 else if (ret < 0)
                         goto transport_err;