diff --git a/CHANGELOG.md b/CHANGELOG.md index b1d6ee979..4c91c9c02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ of spdk_idxd_probe_cb function pointer. It should be implemented in idxd_user.c. Added `min_cntlid` and `max_cntlid` to `nvmf_create_subsystem` to limit the controller ID range. +`spdk_nvmf_request_get_buffers_multi` API is removed. + ### nvme Added a new function `spdk_nvme_ns_cmd_copy` to submit a Simple Copy Command to a Namespace. diff --git a/include/spdk/nvmf_transport.h b/include/spdk/nvmf_transport.h index f3af783fd..b09eb04b2 100644 --- a/include/spdk/nvmf_transport.h +++ b/include/spdk/nvmf_transport.h @@ -2,7 +2,7 @@ * BSD LICENSE * * Copyright (c) Intel Corporation. All rights reserved. - * Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved. + * Copyright (c) 2019, 2021 Mellanox Technologies LTD. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -429,10 +429,6 @@ int spdk_nvmf_request_get_buffers(struct spdk_nvmf_request *req, struct spdk_nvmf_transport_poll_group *group, struct spdk_nvmf_transport *transport, uint32_t length); -int spdk_nvmf_request_get_buffers_multi(struct spdk_nvmf_request *req, - struct spdk_nvmf_transport_poll_group *group, - struct spdk_nvmf_transport *transport, - uint32_t *lengths, uint32_t num_lengths); bool spdk_nvmf_request_get_dif_ctx(struct spdk_nvmf_request *req, struct spdk_dif_ctx *dif_ctx); diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile index 3058f41f9..22cab3985 100644 --- a/lib/nvmf/Makefile +++ b/lib/nvmf/Makefile @@ -34,8 +34,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -SO_VER := 8 -SO_MINOR := 1 +SO_VER := 9 +SO_MINOR := 0 C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \ subsystem.c nvmf.c nvmf_rpc.c transport.c tcp.c diff --git a/lib/nvmf/spdk_nvmf.map b/lib/nvmf/spdk_nvmf.map index c43a96343..fc6ec9cfd 100644 --- a/lib/nvmf/spdk_nvmf.map +++ b/lib/nvmf/spdk_nvmf.map @@ -108,7 +108,6 @@ spdk_nvmf_ctrlr_get_regs; spdk_nvmf_request_free_buffers; spdk_nvmf_request_get_buffers; - spdk_nvmf_request_get_buffers_multi; spdk_nvmf_request_get_dif_ctx; spdk_nvmf_request_exec_fabrics; spdk_nvmf_request_exec; diff --git a/lib/nvmf/transport.c b/lib/nvmf/transport.c index 563b82ae3..4ff3dde43 100644 --- a/lib/nvmf/transport.c +++ b/lib/nvmf/transport.c @@ -2,7 +2,7 @@ * BSD LICENSE * * Copyright (c) Intel Corporation. All rights reserved. - * Copyright (c) 2018-2019 Mellanox Technologies LTD. All rights reserved. + * Copyright (c) 2018-2019, 2021 Mellanox Technologies LTD. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -721,28 +721,3 @@ spdk_nvmf_request_get_buffers(struct spdk_nvmf_request *req, return rc; } - -int -spdk_nvmf_request_get_buffers_multi(struct spdk_nvmf_request *req, - struct spdk_nvmf_transport_poll_group *group, - struct spdk_nvmf_transport *transport, - uint32_t *lengths, uint32_t num_lengths) -{ - int rc = 0; - uint32_t i; - - req->iovcnt = 0; - - for (i = 0; i < num_lengths; i++) { - rc = nvmf_request_get_buffers(req, group, transport, lengths[i]); - if (rc != 0) { - goto err_exit; - } - } - - return 0; - -err_exit: - spdk_nvmf_request_free_buffers(req, group, transport); - return rc; -}