Merge tag 'block-5.6-20200320' of git://git.kernel.dk/linux-block (b74b991f) · Commits · 戴 / test

drivers/nvme/host/rdma.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -850,9 +850,11 @@ out_free_tagset:
		if (new)
		blk_mq_free_tag_set(ctrl->ctrl.admin_tagset);
		out_free_async_qe:
		if (ctrl->async_event_sqe.data) {
		nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
		sizeof(struct nvme_command), DMA_TO_DEVICE);
		ctrl->async_event_sqe.data = NULL;
		}
		out_free_queue:
		nvme_rdma_free_queue(&ctrl->queues[0]);
		return error;

+9 −3

Original line number	Diff line number	Diff line
		@@ -515,7 +515,7 @@ static int nvmet_try_send_data_pdu(struct nvmet_tcp_cmd *cmd)
		return 1;
		}

		static int nvmet_try_send_data(struct nvmet_tcp_cmd *cmd)
		static int nvmet_try_send_data(struct nvmet_tcp_cmd *cmd, bool last_in_batch)
		{
		struct nvmet_tcp_queue *queue = cmd->queue;
		int ret;
		@@ -523,9 +523,15 @@ static int nvmet_try_send_data(struct nvmet_tcp_cmd *cmd)
		while (cmd->cur_sg) {
		struct page *page = sg_page(cmd->cur_sg);
		u32 left = cmd->cur_sg->length - cmd->offset;
		int flags = MSG_DONTWAIT;

		if ((!last_in_batch && cmd->queue->send_list_len) \|\|
		cmd->wbytes_done + left < cmd->req.transfer_len \|\|
		queue->data_digest \|\| !queue->nvme_sq.sqhd_disabled)
		flags \|= MSG_MORE;

		ret = kernel_sendpage(cmd->queue->sock, page, cmd->offset,
		left, MSG_DONTWAIT \| MSG_MORE);
		left, flags);
		if (ret <= 0)
		return ret;

		@@ -660,7 +666,7 @@ static int nvmet_tcp_try_send_one(struct nvmet_tcp_queue *queue,
		}

		if (cmd->state == NVMET_TCP_SEND_DATA) {
		ret = nvmet_try_send_data(cmd);
		ret = nvmet_try_send_data(cmd, last_in_batch);
		if (ret <= 0)
		goto done_send;
		}