4 files changed, 19 insertions, 12 deletions

diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 03977e8996d8..5654dc22f7ae 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -45,7 +45,6 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/target_core_tmr.h>
 #include <target/configfs_macros.h>
 
@@ -264,8 +263,9 @@ int ft_write_pending(struct se_cmd *se_cmd)
                                 cmd->sg_cnt =
                                         se_cmd->t_tasks_sg_chained_no;
                         }
-                        if (cmd->sg && lport->tt.ddp_setup(lport, ep->xid,
-                                                    cmd->sg, cmd->sg_cnt))
+                        if (cmd->sg && lport->tt.ddp_target(lport, ep->xid,
+                                                            cmd->sg,
+                                                            cmd->sg_cnt))
                                 cmd->was_ddp_setup = 1;
                 }
         }
@@ -372,12 +372,23 @@ static void ft_send_resp_status(struct fc_lport *lport,
 
 /*
  * Send error or task management response.
- * Always frees the cmd and associated state.
  */
-static void ft_send_resp_code(struct ft_cmd *cmd, enum fcp_resp_rsp_codes code)
+static void ft_send_resp_code(struct ft_cmd *cmd,
+                              enum fcp_resp_rsp_codes code)
 {
         ft_send_resp_status(cmd->sess->tport->lport,
                             cmd->req_frame, SAM_STAT_GOOD, code);
+}
+
+
+/*
+ * Send error or task management response.
+ * Always frees the cmd and associated state.
+ */
+static void ft_send_resp_code_and_free(struct ft_cmd *cmd,
+                                      enum fcp_resp_rsp_codes code)
+{
+        ft_send_resp_code(cmd, code);
         ft_free_cmd(cmd);
 }
 
@@ -415,7 +426,7 @@ static void ft_send_tm(struct ft_cmd *cmd)
                  * tm_flags set is invalid.
                  */
                 pr_debug("invalid FCP tm_flags %x\n", fcp->fc_tm_flags);
-                ft_send_resp_code(cmd, FCP_CMND_FIELDS_INVALID);
+                ft_send_resp_code_and_free(cmd, FCP_CMND_FIELDS_INVALID);
                 return;
         }
 
@@ -423,7 +434,7 @@ static void ft_send_tm(struct ft_cmd *cmd)
         tmr = core_tmr_alloc_req(&cmd->se_cmd, cmd, tm_func);
         if (!tmr) {
                 pr_debug("alloc failed\n");
-                ft_send_resp_code(cmd, FCP_TMF_FAILED);
+                ft_send_resp_code_and_free(cmd, FCP_TMF_FAILED);
                 return;
         }
         cmd->se_cmd.se_tmr_req = tmr;
@@ -662,7 +673,7 @@ static void ft_send_cmd(struct ft_cmd *cmd)
         return;
 
 err:
-        ft_send_resp_code(cmd, FCP_CMND_FIELDS_INVALID);
+        ft_send_resp_code_and_free(cmd, FCP_CMND_FIELDS_INVALID);
 }
 
 /*
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index d63e3dd3b180..8781d1e423df 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -48,7 +48,6 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/configfs_macros.h>
 
 #include "tcm_fc.h"
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
index 06943eeb3c84..c37f4cd96452 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -54,7 +54,6 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/configfs_macros.h>
 
 #include "tcm_fc.h"
diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index fbcbb3d1d06b..dbb5eaeee399 100644
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -46,10 +46,8 @@
 #include <target/target_core_device.h>
 #include <target/target_core_tpg.h>
 #include <target/target_core_configfs.h>
-#include <target/target_core_base.h>
 #include <target/configfs_macros.h>
 
-#include <scsi/libfc.h>
 #include "tcm_fc.h"
 
 static void ft_sess_delete_all(struct ft_tport *);