Commit 0700542a authored by zhenwei pi's avatar zhenwei pi Committed by Christoph Hellwig
Browse files

nvmet-tcp: remove nvmet_tcp_finish_cmd 



There is only a single call-site of nvmet_tcp_finish_cmd(), this
becomes redundant. Remove nvmet_tcp_finish_cmd() and use the original
function body instead.

Suggested-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarzhenwei pi <pizhenwei@bytedance.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent b6a545ff

drivers/nvme/target/tcp.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -164,7 +164,6 @@ static DEFINE_MUTEX(nvmet_tcp_queue_mutex); 
static struct workqueue_struct *nvmet_tcp_wq;

static struct workqueue_struct *nvmet_tcp_wq;

static const struct nvmet_fabrics_ops nvmet_tcp_ops;

static const struct nvmet_fabrics_ops nvmet_tcp_ops;

static void nvmet_tcp_free_cmd(struct nvmet_tcp_cmd *c);

static void nvmet_tcp_free_cmd(struct nvmet_tcp_cmd *c);

static void nvmet_tcp_finish_cmd(struct nvmet_tcp_cmd *cmd);

static void nvmet_tcp_free_cmd_buffers(struct nvmet_tcp_cmd *cmd);

static void nvmet_tcp_free_cmd_buffers(struct nvmet_tcp_cmd *cmd);





static inline u16 nvmet_tcp_cmd_tag(struct nvmet_tcp_queue *queue,

static inline u16 nvmet_tcp_cmd_tag(struct nvmet_tcp_queue *queue,
@@ -1177,7 +1176,8 @@ static int nvmet_tcp_try_recv_ddgst(struct nvmet_tcp_queue *queue) 
			queue->idx, cmd->req.cmd->common.command_id,

			queue->idx, cmd->req.cmd->common.command_id,

			queue->pdu.cmd.hdr.type, le32_to_cpu(cmd->recv_ddgst),

			queue->pdu.cmd.hdr.type, le32_to_cpu(cmd->recv_ddgst),

			le32_to_cpu(cmd->exp_ddgst));

			le32_to_cpu(cmd->exp_ddgst));

		nvmet_tcp_finish_cmd(cmd);

		nvmet_req_uninit(&cmd->req);

		nvmet_tcp_free_cmd_buffers(cmd);

		nvmet_tcp_fatal_error(queue);

		nvmet_tcp_fatal_error(queue);

		ret = -EPROTO;

		ret = -EPROTO;

		goto out;

		goto out;
@@ -1406,12 +1406,6 @@ static void nvmet_tcp_restore_socket_callbacks(struct nvmet_tcp_queue *queue) 
	write_unlock_bh(&sock->sk->sk_callback_lock);

	write_unlock_bh(&sock->sk->sk_callback_lock);

}

}





static void nvmet_tcp_finish_cmd(struct nvmet_tcp_cmd *cmd)

{

	nvmet_req_uninit(&cmd->req);

	nvmet_tcp_free_cmd_buffers(cmd);

}



static void nvmet_tcp_uninit_data_in_cmds(struct nvmet_tcp_queue *queue)

static void nvmet_tcp_uninit_data_in_cmds(struct nvmet_tcp_queue *queue)

{

{

	struct nvmet_tcp_cmd *cmd = queue->cmds;

	struct nvmet_tcp_cmd *cmd = queue->cmds;