target: merge release_cmd methods

The release_cmd_to_pool and release_cmd_direct methods are always the same.
Merge them into a single release_cmd method, and clean up the fallout.

(nab: fix breakage in transport_generic_free_cmd() parameter build breakage
 in drivers/target/tcm_fc/tfc_cmd.c)

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

2 files changed, 7 insertions, 8 deletions

diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 9a3b486e1aad..74d5bb766201 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -147,7 +147,7 @@ void ft_release_cmd(struct se_cmd *se_cmd)
 
 void ft_check_stop_free(struct se_cmd *se_cmd)
 {
-        transport_generic_free_cmd(se_cmd, 0, 1, 0);
+        transport_generic_free_cmd(se_cmd, 0, 0);
 }
 
 /*
@@ -304,7 +304,7 @@ static void ft_recv_seq(struct fc_seq *sp, struct fc_frame *fp, void *arg)
                 /* XXX need to find cmd if queued */
                 cmd->se_cmd.t_state = TRANSPORT_REMOVE;
                 cmd->seq = NULL;
-                transport_generic_free_cmd(&cmd->se_cmd, 0, 1, 0);
+                transport_generic_free_cmd(&cmd->se_cmd, 0, 0);
                 return;
         }
 
@@ -321,7 +321,7 @@ static void ft_recv_seq(struct fc_seq *sp, struct fc_frame *fp, void *arg)
                 printk(KERN_INFO "%s: unhandled frame r_ctl %x\n",
                        __func__, fh->fh_r_ctl);
                 fc_frame_free(fp);
-                transport_generic_free_cmd(&cmd->se_cmd, 0, 1, 0);
+                transport_generic_free_cmd(&cmd->se_cmd, 0, 0);
                 break;
         }
 }
@@ -443,7 +443,7 @@ static void ft_send_tm(struct ft_cmd *cmd)
                         sess = cmd->sess;
                         transport_send_check_condition_and_sense(&cmd->se_cmd,
                                 cmd->se_cmd.scsi_sense_reason, 0);
-                        transport_generic_free_cmd(&cmd->se_cmd, 0, 1, 0);
+                        transport_generic_free_cmd(&cmd->se_cmd, 0, 0);
                         ft_sess_put(sess);
                         return;
                 }
@@ -645,7 +645,7 @@ static void ft_send_cmd(struct ft_cmd *cmd)
         if (ret == -ENOMEM) {
                 transport_send_check_condition_and_sense(se_cmd,
                                 TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0);
-                transport_generic_free_cmd(se_cmd, 0, 1, 0);
+                transport_generic_free_cmd(se_cmd, 0, 0);
                 return;
         }
         if (ret == -EINVAL) {
@@ -654,7 +654,7 @@ static void ft_send_cmd(struct ft_cmd *cmd)
                 else
                         transport_send_check_condition_and_sense(se_cmd,
                                         se_cmd->scsi_sense_reason, 0);
-                transport_generic_free_cmd(se_cmd, 0, 1, 0);
+                transport_generic_free_cmd(se_cmd, 0, 0);
                 return;
         }
         transport_generic_handle_cdb(se_cmd);
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 20097728e8a0..1cb3d345183f 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -536,8 +536,7 @@ static struct target_core_fabric_ops ft_fabric_ops = {
         .tpg_release_fabric_acl =       ft_tpg_release_fabric_acl,
         .tpg_get_inst_index =           ft_tpg_get_inst_index,
         .check_stop_free =              ft_check_stop_free,
-        .release_cmd_to_pool =          ft_release_cmd,
-        .release_cmd_direct =           ft_release_cmd,
+        .release_cmd =                  ft_release_cmd,
         .shutdown_session =             ft_sess_shutdown,
         .close_session =                ft_sess_close,
         .stop_session =                 ft_sess_stop,