target: make queue_tm_rsp() return void

[cascardo/linux.git] / drivers / infiniband / ulp / srpt / ib_srpt.c

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 3f3f041..653ac6b 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -3011,7 +3011,7 @@ static u8 tcm_to_srp_tsk_mgmt_status(const int tcm_mgmt_status)
  * Callback function called by the TCM core. Must not block since it can be
  * invoked on the context of the IB completion handler.
  */
-static int srpt_queue_response(struct se_cmd *cmd)
+static void srpt_queue_response(struct se_cmd *cmd)
 {
        struct srpt_rdma_ch *ch;
        struct srpt_send_ioctx *ioctx;
@@ -3022,8 +3022,6 @@ static int srpt_queue_response(struct se_cmd *cmd)
        int resp_len;
        u8 srp_tm_status;
 
-       ret = 0;
-
        ioctx = container_of(cmd, struct srpt_send_ioctx, cmd);
        ch = ioctx->ch;
        BUG_ON(!ch);
@@ -3049,7 +3047,7 @@ static int srpt_queue_response(struct se_cmd *cmd)
                     || WARN_ON_ONCE(state == SRPT_STATE_CMD_RSP_SENT))) {
                atomic_inc(&ch->req_lim_delta);
                srpt_abort_cmd(ioctx);
-               goto out;
+               return;
        }
 
        dir = ioctx->cmd.data_direction;
@@ -3061,7 +3059,7 @@ static int srpt_queue_response(struct se_cmd *cmd)
                if (ret) {
                        printk(KERN_ERR "xfer_data failed for tag %llu\n",
                               ioctx->tag);
-                       goto out;
+                       return;
                }
        }
 
@@ -3082,9 +3080,17 @@ static int srpt_queue_response(struct se_cmd *cmd)
                srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);
                target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);
        }
+}
 
-out:
-       return ret;
+static int srpt_queue_data_in(struct se_cmd *cmd)
+{
+       srpt_queue_response(cmd);
+       return 0;
+}
+
+static void srpt_queue_tm_rsp(struct se_cmd *cmd)
+{
+       srpt_queue_response(cmd);
 }
 
 static int srpt_queue_status(struct se_cmd *cmd)
@@ -3097,7 +3103,8 @@ static int srpt_queue_status(struct se_cmd *cmd)
            (SCF_TRANSPORT_TASK_SENSE | SCF_EMULATED_TASK_SENSE))
                WARN_ON(cmd->scsi_status != SAM_STAT_CHECK_CONDITION);
        ioctx->queue_status_only = true;
-       return srpt_queue_response(cmd);
+       srpt_queue_response(cmd);
+       return 0;
 }
 
 static void srpt_refresh_port_work(struct work_struct *work)
@@ -3930,9 +3937,9 @@ static struct target_core_fabric_ops srpt_template = {
        .set_default_node_attributes    = srpt_set_default_node_attrs,
        .get_task_tag                   = srpt_get_task_tag,
        .get_cmd_state                  = srpt_get_tcm_cmd_state,
-       .queue_data_in                  = srpt_queue_response,
+       .queue_data_in                  = srpt_queue_data_in,
        .queue_status                   = srpt_queue_status,
-       .queue_tm_rsp                   = srpt_queue_response,
+       .queue_tm_rsp                   = srpt_queue_tm_rsp,
        /*
         * Setup function pointers for generic logic in
         * target_core_fabric_configfs.c