Skip to content

Commit 75011bd

Browse files
maurizio-lombardikeithbusch
authored andcommitted
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>
1 parent 0849a54 commit 75011bd

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/nvme/target/tcp.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -985,8 +985,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
985985
if (unlikely(data->ttag >= queue->nr_cmds)) {
986986
pr_err("queue %d: received out of bound ttag %u, nr_cmds %u\n",
987987
queue->idx, data->ttag, queue->nr_cmds);
988-
nvmet_tcp_fatal_error(queue);
989-
return -EPROTO;
988+
goto err_proto;
990989
}
991990
cmd = &queue->cmds[data->ttag];
992991
} else {
@@ -997,9 +996,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
997996
pr_err("ttag %u unexpected data offset %u (expected %u)\n",
998997
data->ttag, le32_to_cpu(data->data_offset),
999998
cmd->rbytes_done);
1000-
/* FIXME: use path and transport errors */
1001-
nvmet_tcp_fatal_error(queue);
1002-
return -EPROTO;
999+
goto err_proto;
10031000
}
10041001

10051002
plen = le32_to_cpu(data->hdr.plen);
@@ -1008,16 +1005,19 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)
10081005
cmd->pdu_len == 0 ||
10091006
cmd->pdu_len > NVMET_TCP_MAXH2CDATA)) {
10101007
pr_err("H2CData PDU len %u is invalid\n", cmd->pdu_len);
1011-
/* FIXME: use proper transport errors */
1012-
nvmet_tcp_fatal_error(queue);
1013-
return -EPROTO;
1008+
goto err_proto;
10141009
}
10151010
cmd->pdu_recv = 0;
10161011
nvmet_tcp_build_pdu_iovec(cmd);
10171012
queue->cmd = cmd;
10181013
queue->rcv_state = NVMET_TCP_RECV_DATA;
10191014

10201015
return 0;
1016+
1017+
err_proto:
1018+
/* FIXME: use proper transport errors */
1019+
nvmet_tcp_fatal_error(queue);
1020+
return -EPROTO;
10211021
}
10221022

10231023
static int nvmet_tcp_done_recv_pdu(struct nvmet_tcp_queue *queue)

0 commit comments

Comments
 (0)