diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c
index 669074643..b6b5dfe90 100644
--- a/lib/nvmf/fc.c
+++ b/lib/nvmf/fc.c
@@ -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] +
-						       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;
+		i = req->iovcnt;
+		req->iov[i].iov_base = (void *)((uintptr_t)((char *)req->buffers[i] +
+						NVMF_DATA_BUFFER_MASK) &
+						~NVMF_DATA_BUFFER_MASK);
+		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;
 }