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

[firefly-linux-kernel-4.4.55.git] / drivers / target / target_core_tmr.c

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index a5bb0c46e57e5c6398903141dcab6075ede4a1f8..5b2820312310ec21bf83824efa318caab132e046 100644 (file)
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -31,7 +31,6 @@
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
 #include <target/target_core_fabric.h>
-#include <target/target_core_configfs.h>
 
 #include "target_core_internal.h"
 #include "target_core_alua.h"
@@ -115,7 +114,7 @@ void core_tmr_abort_task(
 {
        struct se_cmd *se_cmd;
        unsigned long flags;
-       int ref_tag;
+       u64 ref_tag;
 
        spin_lock_irqsave(&se_sess->sess_cmd_lock, flags);
        list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) {
@@ -127,16 +126,17 @@ void core_tmr_abort_task(
                if (se_cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)
                        continue;
 
-               ref_tag = se_cmd->se_tfo->get_task_tag(se_cmd);
+               ref_tag = se_cmd->tag;
                if (tmr->ref_task_tag != ref_tag)
                        continue;
 
-               printk("ABORT_TASK: Found referenced %s task_tag: %u\n",
+               printk("ABORT_TASK: Found referenced %s task_tag: %llu\n",
                        se_cmd->se_tfo->get_fabric_name(), ref_tag);
 
                spin_lock(&se_cmd->t_state_lock);
                if (se_cmd->transport_state & CMD_T_COMPLETE) {
-                       printk("ABORT_TASK: ref_tag: %u already complete, skipping\n", ref_tag);
+                       printk("ABORT_TASK: ref_tag: %llu already complete,"
+                              " skipping\n", ref_tag);
                        spin_unlock(&se_cmd->t_state_lock);
                        spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
                        goto out;
@@ -151,18 +151,18 @@ void core_tmr_abort_task(
                cancel_work_sync(&se_cmd->work);
                transport_wait_for_tasks(se_cmd);
 
-               target_put_sess_cmd(se_sess, se_cmd);
+               target_put_sess_cmd(se_cmd);
                transport_cmd_finish_abort(se_cmd, true);
 
                printk("ABORT_TASK: Sending TMR_FUNCTION_COMPLETE for"
-                               " ref_tag: %d\n", ref_tag);
+                               " ref_tag: %llu\n", ref_tag);
                tmr->response = TMR_FUNCTION_COMPLETE;
                return;
        }
        spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags);
 
 out:
-       printk("ABORT_TASK: Sending TMR_TASK_DOES_NOT_EXIST for ref_tag: %d\n",
+       printk("ABORT_TASK: Sending TMR_TASK_DOES_NOT_EXIST for ref_tag: %lld\n",
                        tmr->ref_task_tag);
        tmr->response = TMR_TASK_DOES_NOT_EXIST;
 }
@@ -287,16 +287,16 @@ static void core_tmr_drain_state_list(
                list_del(&cmd->state_list);
 
                pr_debug("LUN_RESET: %s cmd: %p"
-                       " ITT/CmdSN: 0x%08x/0x%08x, i_state: %d, t_state: %d"
+                       " ITT/CmdSN: 0x%08llx/0x%08x, i_state: %d, t_state: %d"
                        "cdb: 0x%02x\n",
                        (preempt_and_abort_list) ? "Preempt" : "", cmd,
-                       cmd->se_tfo->get_task_tag(cmd), 0,
+                       cmd->tag, 0,
                        cmd->se_tfo->get_cmd_state(cmd), cmd->t_state,
                        cmd->t_task_cdb[0]);
-               pr_debug("LUN_RESET: ITT[0x%08x] - pr_res_key: 0x%016Lx"
+               pr_debug("LUN_RESET: ITT[0x%08llx] - pr_res_key: 0x%016Lx"
                        " -- CMD_T_ACTIVE: %d"
                        " CMD_T_STOP: %d CMD_T_SENT: %d\n",
-                       cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
+                       cmd->tag, cmd->pr_res_key,
                        (cmd->transport_state & CMD_T_ACTIVE) != 0,
                        (cmd->transport_state & CMD_T_STOP) != 0,
                        (cmd->transport_state & CMD_T_SENT) != 0);