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

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (62 commits)
  target: Fix compile warning w/ missing module.h include
  target: Remove legacy se_task->task_timer and associated logic
  target: Fix incorrect transport_sent usage
  target: re-use the command S/G list for single-task commands
  target: Fix BIDI t_task_cdb handling in transport_generic_new_cmd
  target: remove transport_allocate_tasks
  target: merge transport_new_cmd_obj into transport_generic_new_cmd
  target: remove the task_sg_bidi field se_task and pSCSI BIDI support
  target: transport_subsystem_check_init cleanups
  target: use a workqueue for I/O completions
  target: remove unused TRANSPORT_ states
  target: remove TRANSPORT_DEFERRED_CMD state
  target: remove the TRANSPORT_REMOVE state
  target: move depth_left manipulation out of transport_generic_request_failure
  target: stop task timers earlier
  target: remove TF_TIMER_STOP
  target: factor some duplicate code for stopping a task
  target: fix list walking in transport_free_dev_tasks
  target: use transport_cmd_check_stop_to_fabric consistently
  target: do not pass the queue object to transport_remove_cmd_from_queue
  ...

36 files changed, 937 insertions, 2068 deletions

diff --git a/drivers/target/Makefile b/drivers/target/Makefile
index 1060c7b7f803..62e54053bcd8 100644
--- a/drivers/target/Makefile
+++ b/drivers/target/Makefile
@@ -6,7 +6,6 @@ target_core_mod-y		:= target_core_configfs.o \
                                    target_core_hba.o \
                                    target_core_pr.o \
                                    target_core_alua.o \
-                                   target_core_scdb.o \
                                    target_core_tmr.o \
                                    target_core_tpg.o \
                                    target_core_transport.o \
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 6a4ea29c2f36..4d01768fcd90 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -765,7 +765,7 @@ static int iscsit_allocate_iovecs(struct iscsi_cmd *cmd)
         u32 iov_count = (cmd->se_cmd.t_data_nents == 0) ? 1 :
                                 cmd->se_cmd.t_data_nents;
 
-        iov_count += TRANSPORT_IOV_DATA_BUFFER;
+        iov_count += ISCSI_IOV_DATA_BUFFER;
 
         cmd->iov_data = kzalloc(iov_count * sizeof(struct kvec), GFP_KERNEL);
         if (!cmd->iov_data) {
@@ -3538,16 +3538,8 @@ get_immediate:
                                 spin_lock_bh(&conn->cmd_lock);
                                 list_del(&cmd->i_list);
                                 spin_unlock_bh(&conn->cmd_lock);
-                                /*
-                                 * Determine if a struct se_cmd is assoicated with
-                                 * this struct iscsi_cmd.
-                                 */
-                                if (!(cmd->se_cmd.se_cmd_flags & SCF_SE_LUN_CMD) &&
-                                    !(cmd->tmr_req))
-                                        iscsit_release_cmd(cmd);
-                                else
-                                        transport_generic_free_cmd(&cmd->se_cmd,
-                                                                1, 0);
+
+                                iscsit_free_cmd(cmd);
                                 goto get_immediate;
                         case ISTATE_SEND_NOPIN_WANT_RESPONSE:
                                 spin_unlock_bh(&cmd->istate_lock);
@@ -3940,7 +3932,6 @@ static void iscsit_release_commands_from_conn(struct iscsi_conn *conn)
 {
         struct iscsi_cmd *cmd = NULL, *cmd_tmp = NULL;
         struct iscsi_session *sess = conn->sess;
-        struct se_cmd *se_cmd;
         /*
          * We expect this function to only ever be called from either RX or TX
          * thread context via iscsit_close_connection() once the other context
@@ -3948,35 +3939,13 @@ static void iscsit_release_commands_from_conn(struct iscsi_conn *conn)
          */
         spin_lock_bh(&conn->cmd_lock);
         list_for_each_entry_safe(cmd, cmd_tmp, &conn->conn_cmd_list, i_list) {
-                if (!(cmd->se_cmd.se_cmd_flags & SCF_SE_LUN_CMD)) {
 
-                        list_del(&cmd->i_list);
-                        spin_unlock_bh(&conn->cmd_lock);
-                        iscsit_increment_maxcmdsn(cmd, sess);
-                        se_cmd = &cmd->se_cmd;
-                        /*
-                         * Special cases for active iSCSI TMR, and
-                         * transport_lookup_cmd_lun() failing from
-                         * iscsit_get_lun_for_cmd() in iscsit_handle_scsi_cmd().
-                         */
-                        if (cmd->tmr_req && se_cmd->transport_wait_for_tasks)
-                                se_cmd->transport_wait_for_tasks(se_cmd, 1, 1);
-                        else if (cmd->se_cmd.se_cmd_flags & SCF_SE_LUN_CMD)
-                                transport_release_cmd(se_cmd);
-                        else
-                                iscsit_release_cmd(cmd);
-
-                        spin_lock_bh(&conn->cmd_lock);
-                        continue;
-                }
                 list_del(&cmd->i_list);
                 spin_unlock_bh(&conn->cmd_lock);
 
                 iscsit_increment_maxcmdsn(cmd, sess);
-                se_cmd = &cmd->se_cmd;
 
-                if (se_cmd->transport_wait_for_tasks)
-                        se_cmd->transport_wait_for_tasks(se_cmd, 1, 1);
+                iscsit_free_cmd(cmd);
 
                 spin_lock_bh(&conn->cmd_lock);
         }
diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
index 11fd74307811..beb39469e7f1 100644
--- a/drivers/target/iscsi/iscsi_target_auth.c
+++ b/drivers/target/iscsi/iscsi_target_auth.c
@@ -18,6 +18,7 @@
  * GNU General Public License for more details.
  ******************************************************************************/
 
+#include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/crypto.h>
 #include <linux/err.h>
@@ -27,40 +28,11 @@
 #include "iscsi_target_nego.h"
 #include "iscsi_target_auth.h"
 
-static unsigned char chap_asciihex_to_binaryhex(unsigned char val[2])