nvmet-tcp: remove boilerplate code

Simplify the nvmet_tcp_handle_h2c_data_pdu() function by removing
boilerplate code.

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index b4b6a8ac8089554f7807cbd769ac4b8cb05ccb7a..3569c1255c5eb7331f15cf8b9756a7c0a1c42b95 100644 (file)
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -985,8 +985,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
                if (unlikely(data->ttag >= queue->nr_cmds)) {
                        pr_err("queue %d: received out of bound ttag %u, nr_cmds %u\n",
                                queue->idx, data->ttag, queue->nr_cmds);
-                       nvmet_tcp_fatal_error(queue);
-                       return -EPROTO;
+                       goto err_proto;
                }
                cmd = &queue->cmds[data->ttag];
        } else {
@@ -997,9 +996,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
                pr_err("ttag %u unexpected data offset %u (expected %u)\n",
                        data->ttag, le32_to_cpu(data->data_offset),
                        cmd->rbytes_done);
-               /* FIXME: use path and transport errors */
-               nvmet_tcp_fatal_error(queue);
-               return -EPROTO;
+               goto err_proto;
        }
 
        plen = le32_to_cpu(data->hdr.plen);
@@ -1008,9 +1005,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
                     cmd->pdu_len == 0 ||
                     cmd->pdu_len > NVMET_TCP_MAXH2CDATA)) {
                pr_err("H2CData PDU len %u is invalid\n", cmd->pdu_len);
-               /* FIXME: use proper transport errors */
-               nvmet_tcp_fatal_error(queue);
-               return -EPROTO;
+               goto err_proto;
        }
        cmd->pdu_recv = 0;
        nvmet_tcp_build_pdu_iovec(cmd);
@@ -1018,6 +1013,11 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
        queue->rcv_state = NVMET_TCP_RECV_DATA;
 
        return 0;
+
+err_proto:
+       /* FIXME: use proper transport errors */
+       nvmet_tcp_fatal_error(queue);
+       return -EPROTO;
 }
 
 static int nvmet_tcp_done_recv_pdu(struct nvmet_tcp_queue *queue)