Commit 90a2be20 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

nvmf/fc: Pass nvmf_request to nvmf_fc_request_fill_buffers 



Most variables related with I/O buffer are in struct spdk_nvmf_request
now. So we can pass nvmf_request instead of nvmf_fc_request to
nvmf_fc_request_fill_buffers and do it in this patch.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ibe87e7641e5c364b20a6d877ce7928c612b0b83a
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466088


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAnil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent 9412a837

lib/nvmf/fc.c

+11 −11
Original line number Diff line number Diff line
@@ -1275,23 +1275,23 @@ complete: 
}



static void

nvmf_fc_request_fill_buffers(struct spdk_nvmf_fc_request *fc_req,

nvmf_fc_request_fill_buffers(struct spdk_nvmf_request *req,

			     struct spdk_nvmf_transport *transport, uint32_t length)

{

	uint32_t i;



	fc_req->req.iovcnt = 0;

	req->iovcnt = 0;



	while (length) {

		i = fc_req->req.iovcnt;

		fc_req->req.iov[i].iov_base = (void *)((uintptr_t)((char *)fc_req->req.buffers[i] +

		i = req->iovcnt;

		req->iov[i].iov_base = (void *)((uintptr_t)((char *)req->buffers[i] +

						NVMF_DATA_BUFFER_MASK) &

						~NVMF_DATA_BUFFER_MASK);

		fc_req->req.iov[i].iov_len  = spdk_min(length, transport->opts.io_unit_size);

		fc_req->req.iovcnt++;

		length -= fc_req->req.iov[i].iov_len;

		req->iov[i].iov_len  = spdk_min(length, transport->opts.io_unit_size);

		req->iovcnt++;

		length -= req->iov[i].iov_len;

	}

	fc_req->req.data_from_pool = true;

	req->data_from_pool = true;

}



static int
@@ -1309,7 +1309,7 @@ nvmf_fc_request_alloc_buffers(struct spdk_nvmf_fc_request *fc_req) 
		return -ENOMEM;

	}



	nvmf_fc_request_fill_buffers(fc_req, transport, length);

	nvmf_fc_request_fill_buffers(&fc_req->req, transport, length);



	return 0;

}